Merge branch 'main' into hotfix/zoom-passcode-prompt

Set Zoom Room privacy/mic mute to report unmuted when not in a meeting

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs

@@ -214,6 +214,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				handler(this, new CodecCallStatusItemChangeEventArgs(item));
 			}
 
+            PrivacyModeIsOnFeedback.FireUpdate();
+
 			if (AutoShareContentWhileInCall)
 			{
 				StartSharing();

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs

@@ -214,7 +214,23 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		protected override Func<bool> PrivacyModeIsOnFeedbackFunc
 		{
-			get { return () => Configuration.Call.Microphone.Mute; }
+            get
+            {
+                return () =>
+                    {
+                        //Debug.Console(2, this, "PrivacyModeIsOnFeedbackFunc. IsInCall: {0} muteState: {1}", IsInCall, Configuration.Call.Microphone.Mute);
+                        if (IsInCall)
+                        {
+                            //Debug.Console(2, this, "reporting muteState: ", Configuration.Call.Microphone.Mute);
+                            return Configuration.Call.Microphone.Mute;
+                        }
+                        else
+                        {
+                            //Debug.Console(2, this, "muteState: true", IsInCall);
+                            return false;
+                        }
+                    };
+            }
 		}
 
 		protected override Func<bool> StandbyIsOnFeedbackFunc
@@ -2495,6 +2511,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 
 			trilist.SetStringSigAction(joinMap.SubmitPassword.JoinNumber, SubmitPassword);
+			trilist.SetStringSigAction(joinMap.CancelPasswordPrompt.JoinNumber,
+				delegate { OnPasswordRequired(false, false, true, ""); });
 			PasswordRequired += (devices, args) =>
 			{
 				if (args.LoginAttemptCancelled)
@@ -3357,6 +3375,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         {
             Debug.Console(2, this, "Password Submitted: {0}", password);
             Dial(_lastDialedMeetingNumber, password);
+			OnPasswordRequired(false, false, true, "");		
         }
 
         void OnPasswordRequired(bool lastAttemptIncorrect, bool loginFailed, bool loginCancelled, string message)

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

@@ -23,6 +23,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 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
         [JoinName("PasswordIncorrect")]
         public JoinDataComplete PasswordIncorrect = new JoinDataComplete(