pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 12:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(essentials): updates to password prompt logic

Browse Source
This commit is contained in:
Neil Dorin
2022-09-22 15:38:11 -06:00
parent b48859d202
commit eae089cdf5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
View File

@@ -2513,14 +2513,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
// Subscribe to call status to clear ShowPasswordPrompt when in meeting // Subscribe to call status to clear ShowPasswordPrompt when in meeting
this.CallStatusChange += (o, a) => this.CallStatusChange += (o, a) =>
{ {
if (IsInCall) if (a.CallItem.Status == eCodecCallStatus.Connected || a.CallItem.Status == eCodecCallStatus.Disconnected)
{ {
trilist.SetBool(joinMap.ShowPasswordPrompt.JoinNumber, false); trilist.SetBool(joinMap.MeetingPasswordRequired.JoinNumber, false);
} }
}; };
trilist.SetSigFalseAction(joinMap.CancelPasswordPrompt.JoinNumber, () => CancelPasswordPrompt()); trilist.SetSigFalseAction(joinMap.CancelJoinAttempt.JoinNumber, () => trilist.SetBool(joinMap.MeetingPasswordRequired.JoinNumber, false));
PasswordRequired += (devices, args) => PasswordRequired += (devices, args) =>
{ {
@@ -2528,7 +2528,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
if (args.LoginAttemptCancelled) if (args.LoginAttemptCancelled)
{ {
trilist.SetBool(joinMap.ShowPasswordPrompt.JoinNumber, false); trilist.SetBool(joinMap.MeetingPasswordRequired.JoinNumber, false);
return; return;
} }
@@ -2544,7 +2544,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
} }
trilist.SetBool(joinMap.PasswordIncorrect.JoinNumber, args.LastAttemptWasIncorrect); trilist.SetBool(joinMap.PasswordIncorrect.JoinNumber, args.LastAttemptWasIncorrect);
trilist.SetBool(joinMap.ShowPasswordPrompt.JoinNumber, true); trilist.SetBool(joinMap.MeetingPasswordRequired.JoinNumber, true);
}; };
trilist.OnlineStatusChange += (device, args) => trilist.OnlineStatusChange += (device, args) =>

8
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomJoinMap.cs
View File

@@ -8,8 +8,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
#region Digital #region Digital
[JoinName("CancelPasswordPrompt")] [JoinName("CancelJoinAttempt")]
public JoinDataComplete CancelPasswordPrompt = new JoinDataComplete( public JoinDataComplete CancelJoinAttempt = new JoinDataComplete(
new JoinData new JoinData
{ {
JoinNumber = 5, JoinNumber = 5,
@@ -22,8 +22,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
JoinType = eJoinType.Digital JoinType = eJoinType.Digital
}); });
[JoinName("ShowPasswordPrompt")] [JoinName("MeetingPasswordRequired")]
public JoinDataComplete ShowPasswordPrompt = new JoinDataComplete( public JoinDataComplete MeetingPasswordRequired = new JoinDataComplete(
new JoinData new JoinData
{ {
JoinNumber = 6, JoinNumber = 6,