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

fix(essentials): reworks SIMPL bridging logic for hiding password prompt

Browse Source
This commit is contained in:
Neil Dorin
2022-09-15 12:44:17 -06:00
parent 77f202b9f4
commit ee735388bb
2 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2509,17 +2509,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
trilist.SetSigTrueAction(joinMap.ShareOnlyMeeting.JoinNumber, StartSharingOnlyMeeting); trilist.SetSigTrueAction(joinMap.ShareOnlyMeeting.JoinNumber, StartSharingOnlyMeeting);
trilist.SetSigTrueAction(joinMap.StartNormalMeetingFromSharingOnlyMeeting.JoinNumber, StartNormalMeetingFromSharingOnlyMeeting); trilist.SetSigTrueAction(joinMap.StartNormalMeetingFromSharingOnlyMeeting.JoinNumber, StartNormalMeetingFromSharingOnlyMeeting);
// not sure if this would be needed here, should be handled by VideoCodecBase.cs LinkToApi methods
//DirectoryResultReturned += (device, args) =>
//{
// // add logic here if necessary when event fires
//};
trilist.SetStringSigAction(joinMap.SubmitPassword.JoinNumber, SubmitPassword); trilist.SetStringSigAction(joinMap.SubmitPassword.JoinNumber, SubmitPassword);
trilist.SetStringSigAction(joinMap.CancelPasswordPrompt.JoinNumber, //trilist.SetSigFalseAction(joinMap.CancelPasswordPrompt.JoinNumber, () =>
delegate { OnPasswordRequired(false, false, true, ""); }); // OnPasswordRequired(false, false, true, ""));
// Subscribe to call status to clear ShowPasswordPrompt when in meeting
this.CallStatusChange += (o, a) =>
{
if (IsInCall)
{
trilist.SetBool(joinMap.ShowPasswordPrompt.JoinNumber, false);
}
};
PasswordRequired += (devices, args) => PasswordRequired += (devices, args) =>
{ {
if (args.LoginAttemptCancelled) if (args.LoginAttemptCancelled)
@@ -3382,7 +3385,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
Debug.Console(2, this, "Password Submitted: {0}", password); Debug.Console(2, this, "Password Submitted: {0}", password);
Dial(_lastDialedMeetingNumber, password); Dial(_lastDialedMeetingNumber, password);
OnPasswordRequired(false, false, true, ""); //OnPasswordRequired(false, false, true, "");
} }
void OnPasswordRequired(bool lastAttemptIncorrect, bool loginFailed, bool loginCancelled, string message) void OnPasswordRequired(bool lastAttemptIncorrect, bool loginFailed, bool loginCancelled, string message)

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

@@ -23,20 +23,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
JoinType = eJoinType.Digital JoinType = eJoinType.Digital
}); });
[JoinName("CancelPasswordPrompt")]
public JoinDataComplete CancelPasswordPrompt = new JoinDataComplete(
new JoinData
{
JoinNumber = 7,
JoinSpan = 1
},
new JoinMetadata
{
Description = "cancels password prompt",
JoinCapabilities = eJoinCapabilities.FromSIMPL,
JoinType = eJoinType.Digital
});
// TODO [ ] Issue #868 // TODO [ ] Issue #868
[JoinName("PasswordIncorrect")] [JoinName("PasswordIncorrect")]
public JoinDataComplete PasswordIncorrect = new JoinDataComplete( public JoinDataComplete PasswordIncorrect = new JoinDataComplete(