Merge 2a37e44d7d into 61c638452b

.github/workflows/docker.yml

@@ -8,9 +8,12 @@ on:
       - bugfix/*
       - release/*
       - development
+  pull_request:
+    branches:
+      - development
 
 env:
-  # solution path doesn't need slashes unless it is multiple folders deep
+  # solution path doesn't need slashes unless there it is multiple folders deep
   # solution name does not include extension. .sln is assumed
   SOLUTION_PATH: PepperDashEssentials
   SOLUTION_FILE: PepperDashEssentials

PepperDashEssentials/ControlSystem.cs

@@ -483,7 +483,7 @@ namespace PepperDash.Essentials
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
-                        CreateMobileControlBridge(room);
+                        CreateMobileControlBridge(room as EssentialsRoomBase);
                     }
                     else if (room is IEssentialsHuddleVtc1Room)
                     {
@@ -494,7 +494,7 @@ namespace PepperDash.Essentials
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
-                        CreateMobileControlBridge(room);
+                        CreateMobileControlBridge(room as EssentialsRoomBase);
                     }
                     else if (room is EssentialsTechRoom)
                     {
@@ -506,7 +506,7 @@ namespace PepperDash.Essentials
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge");
 
-                        CreateMobileControlBridge(room);
+                        CreateMobileControlBridge(room as EssentialsRoomBase);
                     }
                     else
                     {
@@ -527,22 +527,13 @@ namespace PepperDash.Essentials
 
         }
 
-        private static void CreateMobileControlBridge(object room)
+        private static void CreateMobileControlBridge(EssentialsRoomBase room)
         {
             var mobileControl = GetMobileControlDevice();
 
             if (mobileControl == null) return;
 
-            var mobileControl3 = mobileControl as IMobileControl3;
-
-            if (mobileControl3 != null)
-            {
-                mobileControl3.CreateMobileControlRoomBridge(room as IEssentialsRoom, mobileControl);
-            }
-            else
-            {
-                mobileControl.CreateMobileControlRoomBridge(room as EssentialsRoomBase, mobileControl);
-            }
+            mobileControl.CreateMobileControlRoomBridge(room, mobileControl);
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control Bridge Added...");
         }

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

@@ -207,7 +207,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -215,7 +215,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void InitializeRoom()
+        void Initialize()
         {
             if (DefaultAudioDevice is IBasicVolumeControls)
                 DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -156,7 +156,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IRoutingSinkWithSwitching;
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -164,7 +164,7 @@ namespace PepperDash.Essentials
             }
         }
 
-		void InitializeRoom()
+		void Initialize()
 		{
             if (DefaultAudioDevice is IBasicVolumeControls)
                 DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -226,7 +226,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -234,7 +234,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void InitializeRoom()
+        void Initialize()
 		{
             try
             {

PepperDashEssentials/Room/Types/IEssentialsHuddleSpaceRoom.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.AudioCodec;
-
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials
-{
-    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IHasDefaultDisplay
-    {
-        bool ExcludeFromGlobalFunctions { get; }
-
-        void RunRouteAction(string routeKey);
-
-        EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; }
-
-        IBasicVolumeControls CurrentVolumeControls { get; }
-
-        event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-    }
-
-    public interface IEssentialsHuddleVtc1Room : IEssentialsRoom, IHasCurrentSourceInfoChange,
-        IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay
-    {
-        EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }
-
-        void RunRouteAction(string routeKey);
-
-        IHasScheduleAwareness ScheduleSource { get; }
-
-        string DefaultCodecRouteString { get; }
-    }
-}

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -948,24 +948,5 @@ namespace PepperDash.Essentials
         /// 15214
         /// </summary>
         public const uint PinDialogDot4 = 15214;
-
-        //  Password Prompt Dialog **************************
-
-        /// <summary>
-        /// 15301
-        /// </summary>
-        public const uint PasswordPromptDialogVisible = 15301;
-        /// <summary>
-        /// 15302
-        /// </summary>
-        public const uint PasswordPromptTextPress = 15302;
-        /// <summary>
-        /// 15306
-        /// </summary>
-        public const uint PasswordPromptCancelPress = 15306;
-        /// <summary>
-        /// 15307
-        /// </summary>
-        public const uint PasswordPromptErrorVisible = 15307;
     }
 }

PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs

@@ -118,14 +118,6 @@ namespace PepperDash.Essentials
 
         //----- through 3120
 
-        /// <summary>
-        /// 3201
-        /// </summary>
-        public const uint PasswordPromptMessageText = 3201;
-        /// <summary>
-        /// 3202
-        /// </summary>
-        public const uint PasswordPromptPasswordText = 3202;
 
         /// <summary>
         /// 3812

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -918,7 +918,6 @@ namespace PepperDash.Essentials
                 TriList.BooleanInput[StartPageVisibleJoin].BoolValue = true;
                 TriList.BooleanInput[UIBoolJoin.VolumeSingleMute1Visible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
-                TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
             }
         }
 

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using System.Globalization;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.UI;
@@ -471,16 +470,12 @@ namespace PepperDash.Essentials
 				Debug.Console(0, "*#* Room on: {0}, lastMeetingDismissedId: {1} {2} *#*", 
 					CurrentRoom.OnFeedback.BoolValue,
 					LastMeetingDismissedId,
-                    lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToString("t", Global.Culture) : "");
+					lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToShortTimeString() : "");
 
 				var meeting = meetings.LastOrDefault(m => m.Joinable);
 				if (CurrentRoom.OnFeedback.BoolValue
 					&& lastMeetingDismissed == meeting)
 				{
-                    // meeting no longer joinable, hide popup
-                    if(meeting == null)
-                        HideNextMeetingPopup();
-
 					return;
 				}
 
@@ -492,11 +487,9 @@ namespace PepperDash.Essentials
 				}
 				else
 				{
-
-
 					TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
-                    TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToString("t", Global.Culture));
-                    TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToString("t", Global.Culture));
+					TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToShortTimeString());
+					TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToShortTimeString());
 					TriList.SetString(UIStringJoin.NextMeetingTitleText, meeting.Title);
 					TriList.SetString(UIStringJoin.NextMeetingNameText, meeting.Organizer);
 					TriList.SetString(UIStringJoin.NextMeetingButtonLabel, "Join");
@@ -519,7 +512,7 @@ namespace PepperDash.Essentials
 					// indexOf = 3, 4 meetings :  
 					if (indexOfNext < meetings.Count)
 						TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText,
-                            meetings[indexOfNext].StartTime.ToString("t", Global.Culture));
+							meetings[indexOfNext].StartTime.ToShortTimeString());
 					else
 						TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText, "No more meetings today");
 
@@ -640,10 +633,7 @@ namespace PepperDash.Essentials
                 var callMode = CurrentMode == UiDisplayMode.Call;
 
                 TriList.SetBool(StartPageVisibleJoin, startMode ? true : false);
-
                 TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, presentationMode ? true : false);
-                if (!presentationMode)
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
 
                 CallButtonSig.BoolValue = callMode
                     && CurrentRoom.ShutdownType == eShutdownType.None;
@@ -682,22 +672,22 @@ namespace PepperDash.Essentials
                 VCDriver.Hide();
 			HideNextMeetingPopup();
             // Run default source when room is off and share is pressed
+            if (!CurrentRoom.OnFeedback.BoolValue)
+            { 
 				if (!CurrentRoom.OnFeedback.BoolValue)
 				{
 					// If there's no default, show UI elements
 					if (!(CurrentRoom as IRunDefaultPresentRoute).RunDefaultPresentRoute())
 						TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
 				}
+            }
             else // room is on show what's active or select a source if nothing is yet active
             {
-                if(CurrentRoom.CurrentSourceInfo == null || (CurrentRoom.VideoCodec != null && CurrentRoom.CurrentSourceInfo.SourceDevice.Key == CurrentRoom.VideoCodec.OsdSource.Key))
+                if(CurrentRoom.CurrentSourceInfo == null || CurrentRoom.CurrentSourceInfoKey == CurrentRoom.DefaultCodecRouteString)
                     TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
                 else if (CurrentSourcePageManager != null)
-                {
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
                     CurrentSourcePageManager.Show();
             }
-            }
             CurrentMode = UiDisplayMode.Presentation;
 			SetupSourceList();
         }
@@ -1141,30 +1131,6 @@ namespace PepperDash.Essentials
         /// <param name="type"></param>
         void CurrentRoom_CurrentSingleSourceChange(SourceListItem info, ChangeType type)
         {
-            Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange");
-
-            // Show the Select a source subpage 
-            if (TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue)
-            {
-                Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange SourceStagingBarVisisble: true");
-
-                if (_CurrentRoom.CurrentSourceInfo == null || (_CurrentRoom.VideoCodec != null && _CurrentRoom.CurrentSourceInfo.SourceDevice.Key == _CurrentRoom.VideoCodec.OsdSource.Key))
-                {
-                    Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Showing SelectASourceVisible");
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
-                }
-                else
-                {
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-                    Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Hiding SelectASourceVisible");
-                }
-            }
-            else
-            {
-                Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Hiding SelectASourceVisible");
-                TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-            }
-
             if (_CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue && _CurrentRoom.CurrentSourceInfo != null)
                 TriList.StringInput[UIStringJoin.CallSharedSourceNameText].StringValue = _CurrentRoom.CurrentSourceInfo.PreferredName;
         }
@@ -1216,8 +1182,8 @@ namespace PepperDash.Essentials
 			foreach (var m in CurrentRoom.ScheduleSource.CodecSchedule.Meetings)
 			{
 				i++;
-                MeetingOrContactMethodModalSrl.StringInputSig(i, 1).StringValue = m.StartTime.ToString("t", Global.Culture);
-                MeetingOrContactMethodModalSrl.StringInputSig(i, 2).StringValue = m.EndTime.ToString("t", Global.Culture);
+				MeetingOrContactMethodModalSrl.StringInputSig(i, 1).StringValue = m.StartTime.ToShortTimeString();
+				MeetingOrContactMethodModalSrl.StringInputSig(i, 2).StringValue = m.EndTime.ToShortTimeString();
 				MeetingOrContactMethodModalSrl.StringInputSig(i, 3).StringValue = m.Title;
                 MeetingOrContactMethodModalSrl.StringInputSig(i, 4).StringValue = string.Format("<br>{0}",m.Organizer);
                 MeetingOrContactMethodModalSrl.StringInputSig(i, 5).StringValue = "Join";
@@ -1262,12 +1228,12 @@ namespace PepperDash.Essentials
             var value = _CurrentRoom.OnFeedback.BoolValue;
             TriList.BooleanInput[UIBoolJoin.RoomIsOn].BoolValue = value;
 
-            //TriList.BooleanInput[StartPageVisibleJoin].BoolValue = !value;
+            TriList.BooleanInput[StartPageVisibleJoin].BoolValue = !value;
 
             if (value) //ON
             {
                 SetupActivityFooterWhenRoomOn();
-                //TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
+                TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = true;
 
             }

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Globalization;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
@@ -84,9 +83,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
         StringBuilder SearchStringBuilder = new StringBuilder();
         BoolFeedback SearchStringBackspaceVisibleFeedback;
 
-        StringFeedback PasswordStringFeedback;
-        StringBuilder PasswordStringBuilder = new StringBuilder();
-
         ModalDialog IncomingCallModal;
 
         eKeypadMode KeypadMode;
@@ -184,23 +180,9 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 });
                 SearchStringFeedback.LinkInputSig(triList.StringInput[UIStringJoin.CodecDirectorySearchEntryText]);
 
-                PasswordStringFeedback = new StringFeedback(() =>
-                {
-                    if (PasswordStringBuilder.Length > 0)
-                    {
-                        Parent.Keyboard.EnableGoButton();
-                        return PasswordStringBuilder.ToString();
-                    }
-                    else
-                    {
-                        Parent.Keyboard.DisableGoButton();
-                        return "";
-                    }
-                });
-                PasswordStringFeedback.LinkInputSig(triList.StringInput[UIStringJoin.PasswordPromptPasswordText]);
-
                 SetupDirectoryList();
 
+
                 SearchStringBackspaceVisibleFeedback = new BoolFeedback(() => SearchStringBuilder.Length > 0);
                 SearchStringBackspaceVisibleFeedback.LinkInputSig(triList.BooleanInput[UIBoolJoin.VCDirectoryBackspaceVisible]);
 
@@ -217,12 +199,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 triList.SetSigHeldAction(UIBoolJoin.VCDirectoryBackspacePress, 500,
                     StartSearchBackspaceRepeat, StopSearchBackspaceRepeat, SearchKeypadBackspacePress);
 
-
-                if (Codec is IPasswordPrompt)
-                {
-                    SetupPasswordPrompt();
-                }
-
             }
             catch (Exception e)
             {
@@ -323,7 +299,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             {
                 case eCodecCallStatus.Connected:
                     // fire at SRL item
-                    HidePasswordPrompt();
                     KeypadMode = eKeypadMode.DTMF;
                     DialStringBuilder.Remove(0, DialStringBuilder.Length);
                     DialStringFeedback.FireUpdate();
@@ -1009,7 +984,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 					// if it's today, show a simpler string
 					string timeText = null;
 					if (c.StartTime.Date == DateTime.Now.Date)
-                        timeText = c.StartTime.ToString("t", Global.Culture);
+						timeText = c.StartTime.ToShortTimeString();
 					else if (c.StartTime == DateTime.MinValue)
 						timeText = "";
 					else
@@ -1066,20 +1041,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		void SetupDirectoryList()
 		{
 			var codec = Codec as IHasDirectory;
-		    if (codec == null)
+			if (codec != null)
 			{
-		        return;
-		    }
-
 				DirectoryList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCDirectoryList],
 					true, 1300);
-		    codec.DirectoryResultReturned += dir_DirectoryResultReturned;
+				codec.DirectoryResultReturned += new EventHandler<DirectoryEventArgs>(dir_DirectoryResultReturned);
 
 				if (codec.PhonebookSyncState.InitialSyncComplete)
 					SetCurrentDirectoryToRoot();
 				else
 				{
-		        codec.PhonebookSyncState.InitialSyncCompleted += PhonebookSyncState_InitialSyncCompleted;
+					codec.PhonebookSyncState.InitialSyncCompleted += new EventHandler<EventArgs>(PhonebookSyncState_InitialSyncCompleted);
+				}
+
+			    RefreshDirectory();
+				
 			}
 		}
 
@@ -1088,15 +1064,11 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void SetCurrentDirectoryToRoot()
         {
-            var hasDirectory = Codec as IHasDirectory;
+            (Codec as IHasDirectory).SetCurrentDirectoryToRoot();
 
-            if (hasDirectory == null)
-            {
-                return;
-            }
-
-            hasDirectory.SetCurrentDirectoryToRoot();
             SearchKeypadClear();
+
+            RefreshDirectory();
         }
 
         /// <summary>
@@ -1108,17 +1080,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
         {
             var codec = Codec as IHasDirectory;
 
-            if (codec == null)
-            {
-                return;
-            }
-
-            if (!codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
-            {
-                return;
-            }
-
             SetCurrentDirectoryToRoot();
+
+            RefreshDirectory();
+            
         }
 
 		/// <summary>
@@ -1128,7 +1093,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <param name="e"></param>
 		void dir_DirectoryResultReturned(object sender, DirectoryEventArgs e)
 		{
-		    RefreshDirectory(e.Directory);
+
+			RefreshDirectory();
 		}
 
         /// <summary>
@@ -1160,24 +1126,13 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <summary>
 		/// 
 		/// </summary>
+		/// <param name="dir"></param>
 		void RefreshDirectory()
 		{
-		    var codec = Codec as IHasDirectory;
-
-		    if (codec == null)
-		    {
-		        return;
-		    }
-
-		    RefreshDirectory(codec.CurrentDirectoryResult);
-		}
-
-        void RefreshDirectory(CodecDirectory directory)
-        {
-            if (directory.CurrentDirectoryResults.Count > 0)
+            if ((Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults.Count > 0)
             {
                 ushort i = 0;
-                foreach (var r in directory.CurrentDirectoryResults)
+                foreach (var r in (Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults)
                 {
                     if (i == DirectoryList.MaxCount)
                     {
@@ -1197,35 +1152,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             // If more than one contact method, show contact method modal dialog
                             DirectoryList.SetItemButtonAction(i, b =>
                             {
-                                if (b)
+                                if (!b)
                                 {
-                                    return;
-                                }
                                     // Refresh the contact methods list
                                     RefreshContactMethodsModalList(dc);
                                     Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible);
+                                }
                             });
 
                         }
-                        else if (dc.ContactMethods.Count == 1)
-                        {
-                            var invitableContact = dc as IInvitableContact;
-
-                            if (invitableContact != null)
-                            {
-                                DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(invitableContact); });
-                            }
                         else
                         {
                             // If only one contact method, just dial that method
 							DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
                         }
                     }
-                        else
-                        {
-                            Debug.Console(1, "Unable to dial contact.  No availble ContactMethod(s) specified");
-                        }
-                    }
                     else    // is DirectoryFolder
                     {
                         DirectoryList.SetItemMainText(i, string.Format("[+] {0}", r.Name));
@@ -1250,6 +1191,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 DirectoryList.SetItemMainText(1, "No Results Found");
             }
+
 		}
 
         void RefreshContactMethodsModalList(DirectoryContact contact)
@@ -1353,21 +1295,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void RevealKeyboard()
         {
-            if (_passwordPromptDialogVisible)
-            {
-                Debug.Console(2, "Attaching Keyboard to PasswordPromptDialog");
-                DetachDialKeyboard();
-                DetachSearchKeyboard();
-                var kb = Parent.Keyboard;
-                kb.KeyPress -= Keyboard_PasswordKeyPress;
-                kb.KeyPress += Keyboard_PasswordKeyPress;
-                kb.HideAction = this.DetachPasswordKeyboard;
-                kb.GoButtonText = "Submit";
-                kb.GoButtonVisible = true;
-                PasswordStringCheckEnables();
-                kb.Show();
-            }
-            else if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCKeypadWithFavoritesVisible && KeypadMode == eKeypadMode.Dial)
+            if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCKeypadWithFavoritesVisible && KeypadMode == eKeypadMode.Dial)
             {
                 var kb = Parent.Keyboard;
 				kb.KeyPress -= Keyboard_DialKeyPress;
@@ -1389,7 +1317,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 SearchStringKeypadCheckEnables();
                 kb.Show();
             }
-
         }
 
         /// <summary>
@@ -1445,32 +1372,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             }
         }
 
-        /// <summary>
-        /// Event handler for keyboard dialing
-        /// </summary>
-        void Keyboard_PasswordKeyPress(object sender, PepperDash.Essentials.Core.Touchpanels.Keyboards.KeyboardControllerPressEventArgs e)
-        {
-            if (_passwordPromptDialogVisible)
-            {
-                if (e.Text != null)
-                    PasswordStringBuilder.Append(e.Text);
-                else
-                {
-                    if (e.SpecialKey == KeyboardSpecialKey.Backspace)
-                        PasswordKeypadBackspacePress();
-                    else if (e.SpecialKey == KeyboardSpecialKey.Clear)
-                        PasswordKeypadClear();
-                    else if (e.SpecialKey == KeyboardSpecialKey.GoButton)
-                    {
-                        (Codec as IPasswordPrompt).SubmitPassword(PasswordStringBuilder.ToString());
-                        HidePasswordPrompt();
-                    }
-                }
-                PasswordStringFeedback.FireUpdate();
-                PasswordStringCheckEnables();
-            }
-        }
-
 		/// <summary>
 		/// Call
 		/// </summary>
@@ -1484,11 +1385,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             Parent.Keyboard.KeyPress -= Keyboard_SearchKeyPress;
         }
 
-        void DetachPasswordKeyboard()
-        {
-            Parent.Keyboard.KeyPress -= Keyboard_PasswordKeyPress;
-        }
-
         /// <summary>
         /// Shows the camera controls subpage
         /// </summary>
@@ -1742,40 +1638,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 Parent.Keyboard.DisableGoButton();
         }
 
-        /// <summary>
-        /// Clears the Password keypad
-        /// </summary>
-        void PasswordKeypadClear()
-        {
-            PasswordStringBuilder.Remove(0, SearchStringBuilder.Length);
-            PasswordStringFeedback.FireUpdate();
-            PasswordStringCheckEnables();
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void PasswordKeypadBackspacePress()
-        {
-            PasswordStringBuilder.Remove(PasswordStringBuilder.Length - 1, 1);
-
-            PasswordStringFeedback.FireUpdate();
-            PasswordStringCheckEnables();
-        }
-
-        /// <summary>
-        /// Checks the enabled states of various elements around the keypad
-        /// </summary>
-        void PasswordStringCheckEnables()
-        {
-            var textIsEntered = PasswordStringBuilder.Length > 0;
-            if (textIsEntered)
-                Parent.Keyboard.EnableGoButton();
-            else
-                Parent.Keyboard.DisableGoButton();
-        }
-
 
         /// <summary>
         /// Returns the text value for the keypad dial entry field
@@ -1821,61 +1683,5 @@ namespace PepperDash.Essentials.UIDrivers.VC
             Dial = 0,
             DTMF
         }
-
-        void SetupPasswordPrompt()
-        {
-            var passwordPromptCodec = Codec as IPasswordPrompt;
-
-            passwordPromptCodec.PasswordRequired += new EventHandler<PasswordPromptEventArgs>(passwordPromptCodec_PasswordRequired);
-
-            TriList.SetSigFalseAction(UIBoolJoin.PasswordPromptCancelPress, HidePasswordPrompt);
-            TriList.SetSigFalseAction(UIBoolJoin.PasswordPromptTextPress, RevealKeyboard);
-        }
-
-        void passwordPromptCodec_PasswordRequired(object sender, PasswordPromptEventArgs e)
-        {
-            if (e.LoginAttemptCancelled)
-            {
-                HidePasswordPrompt();
-                return;
-            }
-
-            if (!string.IsNullOrEmpty(e.Message))
-            {
-                TriList.SetString(UIStringJoin.PasswordPromptMessageText, e.Message);
-            }
-
-            if (e.LoginAttemptFailed)
-            {
-                // TODO: Show a message modal to indicate the login attempt failed
-                return;
-            }
-
-            TriList.SetBool(UIBoolJoin.PasswordPromptErrorVisible, e.LastAttemptWasIncorrect);
-
-            ShowPasswordPrompt();
-        }
-
-        private bool _passwordPromptDialogVisible;
-
-        void ShowPasswordPrompt()
-        {
-            // Clear out any previous data
-            PasswordKeypadClear();
-
-            _passwordPromptDialogVisible = true;
-            TriList.SetBool(UIBoolJoin.PasswordPromptDialogVisible, _passwordPromptDialogVisible);
-            RevealKeyboard();
-        }
-
-        void HidePasswordPrompt()
-        {
-            if (_passwordPromptDialogVisible)
-            {
-                _passwordPromptDialogVisible = false;
-                Parent.Keyboard.Hide();
-                TriList.SetBool(UIBoolJoin.PasswordPromptDialogVisible, _passwordPromptDialogVisible);
-            }
-        }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs

@@ -13,14 +13,6 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         void LinkSystemMonitorToAppServer();
     }
 
-    /// <summary>
-    /// Describes a MobileSystemController that accepts IEssentialsRoom
-    /// </summary>
-    public interface IMobileControl3 : IMobileControl
-    {
-        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
-    }
-
     /// <summary>
     /// Describes a MobileControl Room Bridge
     /// </summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IPasswordPrompt.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Describes the functionality required to prompt a user to enter a password
-    /// </summary>
-    public interface IPasswordPrompt
-    {
-        /// <summary>
-        /// Notifies when a password is required or is entered incorrectly
-        /// </summary>
-        event EventHandler<PasswordPromptEventArgs> PasswordRequired;
-
-        /// <summary>
-        /// Submits the password
-        /// </summary>
-        /// <param name="password"></param>
-        void SubmitPassword(string password);
-    }
-
-    public class PasswordPromptEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Indicates if the last submitted password was incorrect
-        /// </summary>
-        public bool LastAttemptWasIncorrect { get; private set; }
-
-        /// <summary>
-        /// Indicates that the login attempt has failed
-        /// </summary>
-        public bool LoginAttemptFailed { get; private set; }
-
-        /// <summary>
-        /// Indicates that the process was cancelled and the prompt should be dismissed
-        /// </summary>
-        public bool LoginAttemptCancelled { get; private set; }
-
-        /// <summary>
-        /// A message to be displayed to the user
-        /// </summary>
-        public string Message { get; private set; }
-
-        public PasswordPromptEventArgs(bool lastAttemptIncorrect, bool loginFailed, bool loginCancelled, string message)
-        {
-            LastAttemptWasIncorrect = lastAttemptIncorrect;
-            LoginAttemptFailed = loginFailed;
-            LoginAttemptCancelled = loginCancelled;
-            Message = message;
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Text.RegularExpressions;
-using System.Globalization;
 using Crestron.SimplSharp;
 using System.Collections.Generic;
 using Crestron.SimplSharp.CrestronIO;
@@ -29,10 +28,6 @@ namespace PepperDash.Essentials.Core
 
         public static eCrestronSeries ProcessorSeries { get { return CrestronEnvironment.ProgramCompatibility; } }
 
-        // TODO: consider making this configurable later
-        public static IFormatProvider Culture = CultureInfo.CreateSpecificCulture("en-US");
-
-
         /// <summary>
         /// The file path prefix to the folder containing configuration files
         /// </summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -203,7 +203,6 @@
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
-    <Compile Include="DeviceTypeInterfaces\IPasswordPrompt.cs" />
     <Compile Include="DeviceTypeInterfaces\ITvPresetsProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
     <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/IEssentialsRoom.cs

@@ -15,7 +15,7 @@ namespace PepperDash.Essentials.Core
     /// <summary>
     /// Describes the basic functionality of an EssentialsRoom
     /// </summary>
-    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice, IRunDefaultPresentRoute
+    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice
     {
         BoolFeedback OnFeedback { get; }
 
@@ -56,6 +56,7 @@ namespace PepperDash.Essentials.Core
         void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes);
 
         void PowerOnToDefaultOrLastSource();
+        bool RunDefaultPresentRoute();
 
         void SetDefaultLevels();
 

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz202CController.cs

@@ -313,7 +313,7 @@ namespace PepperDash.Essentials.DM
             var localVideoInputPort =
                 InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
             var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
+                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
 
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
@@ -338,8 +338,8 @@ namespace PepperDash.Essentials.DM
                     OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.VideoSourceFeedback);
+                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
+                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
                     OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs

@@ -339,7 +339,7 @@ namespace PepperDash.Essentials.DM
             var localVideoInputPort =
                 InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
             var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
+                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
 
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
@@ -364,8 +364,8 @@ namespace PepperDash.Essentials.DM
                     OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.VideoSourceFeedback);
+                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
+                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
                     OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;

essentials-framework/Essentials Devices Common/Essentials Devices Common/AudioCodec/Interfaces/IHasAudioCodec.cs

@@ -11,9 +11,10 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
     /// <summary>
     /// For rooms that have audio codec
     /// </summary>
-    public interface IHasAudioCodec:IHasInCallFeedback
+    public interface IHasAudioCodec
     {
         AudioCodecBase AudioCodec { get; }
+        BoolFeedback InCallFeedback { get; }
 
         ///// <summary>
         ///// Make this more specific

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs

@@ -216,10 +216,20 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 var presetsCamera = cameraDevice as IHasCameraPresets;
                 presetsCamera.PresetsListHasChanged += new EventHandler<EventArgs>((o, a) =>
                 {
-                    SendCameraPresetNamesToApi(presetsCamera, joinMap, trilist);
-                });
+                    for (int i = 1; i <= joinMap.NumberOfPresets.JoinNumber; i++)
+                    {
+                        int tempNum = i - 1;
 
-                SendCameraPresetNamesToApi(presetsCamera, joinMap, trilist);
+                        string label = "";
+
+                        var preset = presetsCamera.Presets.FirstOrDefault(p => p.ID.Equals(i));
+
+                        if (preset != null)
+                            label = preset.Description;
+
+                        trilist.SetString((ushort) (joinMap.PresetLabelStart.JoinNumber + tempNum), label);
+                    }
+                });
 
                 for (int i = 0; i < joinMap.NumberOfPresets.JoinNumber; i++)
                 {
@@ -236,35 +246,10 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                         presetsCamera.PresetStore(tempNum, label);
                     });
                 }
-                trilist.OnlineStatusChange += (sender, args) =>
-                {
-                    if (!args.DeviceOnLine)
-                    { return; }
-
-                    SendCameraPresetNamesToApi(presetsCamera, joinMap, trilist);
-                };
-
-            }
-        }
-        private void SendCameraPresetNamesToApi(IHasCameraPresets presetsCamera, CameraControllerJoinMap joinMap, BasicTriList trilist)
-        {
-            for (int i = 1; i <= joinMap.NumberOfPresets.JoinNumber; i++)
-            {
-                int tempNum = i - 1;
-
-                string label = "";
-
-                var preset = presetsCamera.Presets.FirstOrDefault(p => p.ID.Equals(i));
-
-                if (preset != null)
-                    label = preset.Description;
-
-                trilist.SetString((ushort)(joinMap.PresetLabelStart.JoinNumber + tempNum), label);
             }
         }
 	}
 
-
     public class CameraPreset : PresetBase
     {
         public CameraPreset(int id, string description, bool isDefined, bool isDefinable)

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraVisca.cs

@@ -525,15 +525,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
         public event EventHandler<EventArgs> PresetsListHasChanged;
 
-		protected void OnPresetsListHasChanged()
-		{
-			var handler = PresetsListHasChanged;
-			if (handler == null)
-				return;
-
-			handler.Invoke(this, EventArgs.Empty);
-		}
-
         public List<CameraPreset> Presets { get; private set; }
 
         public void PresetSelect(int preset)
@@ -546,7 +537,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             SavePreset(preset);
         }
 
-
         #endregion
 
         #region IHasCameraFocusControl Members

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs

@@ -69,22 +69,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("directoryResults")]
         public List<DirectoryItem> CurrentDirectoryResults { get; private set; }
 
-        public List<DirectoryItem> Contacts
-        {
-            get
-            {
-                return CurrentDirectoryResults.OfType<DirectoryContact>().Cast<DirectoryItem>().ToList();
-            }
-        }
-
-        public List<DirectoryItem> Folders
-        {
-            get
-            {
-                return CurrentDirectoryResults.OfType<DirectoryFolder>().Cast<DirectoryItem>().ToList();
-            }
-        }
-
         /// <summary>
         /// Used to store the ID of the current folder for CurrentDirectoryResults
         /// </summary>
@@ -120,15 +104,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             SortDirectory();
         }
 
-        /// <summary>
-        /// Filters the CurrentDirectoryResults by the predicate
-        /// </summary>
-        /// <param name="predicate"></param>
-        public void FilterContacts(Func<DirectoryItem, bool> predicate)
-        {
-            CurrentDirectoryResults = CurrentDirectoryResults.Where(predicate).ToList();
-        }
-
         /// <summary>
         /// Sorts the DirectoryResults list to display all folders alphabetically, then all contacts alphabetically
         /// </summary>
@@ -160,19 +135,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public interface IInvitableContact
     {
-        bool IsInvitableContact { get; }
-    }
 
-    public class InvitableDirectoryContact : DirectoryContact, IInvitableContact
-    {
-        [JsonProperty("isInvitableContact")]
-        public bool IsInvitableContact
-        {
-            get
-            {
-                return this is IInvitableContact;
-            }
-        }
     }
 
 	/// <summary>
@@ -221,6 +184,8 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("title")]
         public string Title { get; set; }
 
+        
+
 		[JsonProperty("contactMethods")]
         public List<ContactMethod> ContactMethods { get; set; }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -123,7 +123,6 @@
     <Compile Include="VideoCodec\Interfaces\IHasParticipants.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasSelfviewPosition.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasSelfviewSize.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasStartMeeting.cs" />
     <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
     <Compile Include="Codec\iHasCallFavorites.cs" />
     <Compile Include="Codec\iHasCallHistory.cs" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs

@@ -743,10 +743,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 
         }
 
-        /// <summary>
-        /// Appends the delimiter and send the command to the codec
-        /// </summary>
-        /// <param name="command"></param>
         public void SendText(string command)
         {
             if (CommDebuggingIsOn)

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs

@@ -327,7 +327,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public SpeakerTrack()
             {
                 Status = new Status2();
-                Availability = new Availability();
             }
         }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasParticipants.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
@@ -50,8 +49,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
     {
         private List<Participant> _currentParticipants;
  
-		public List<Participant> CurrentParticipants
-		{
+        public List<Participant> CurrentParticipants {
             get { return _currentParticipants; }
             set
             {

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasStartMeeting.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
-{
-    /// <summary>
-    /// Describes the ability to start an ad-hoc meeting
-    /// </summary>
-    public interface IHasStartMeeting
-    {
-        /// <summary>
-        /// The default meeting duration in minutes
-        /// </summary>
-        uint DefaultMeetingDurationMin { get; }
-
-        /// <summary>
-        /// Start an ad-hoc meeting for the specified duration
-        /// </summary>
-        /// <param name="duration"></param>
-        void StartMeeting(uint duration);
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasVideoCodec.cs

@@ -11,9 +11,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 	/// <summary>
 	/// For rooms that have video codec
 	/// </summary>
-	public interface IHasVideoCodec:IHasInCallFeedback,IPrivacy
+	public interface IHasVideoCodec
 	{
 		VideoCodecBase VideoCodec { get; }
+		BoolFeedback InCallFeedback { get; }
 
         ///// <summary>
         ///// Make this more specific
@@ -25,6 +26,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		/// </summary>
 		IntFeedback CallTypeFeedback { get; }
 
+		/// <summary>
+		/// 
+		/// </summary>
+		BoolFeedback PrivacyModeIsOnFeedback { get; }
+
 		/// <summary>
 		/// When something in the room is sharing with the far end or through other means
 		/// </summary>

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

@@ -836,10 +836,10 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				//serials
 				tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, meeting.Organizer);
 				tokenArray[stringIndex + 1] = new XSigSerialToken(stringIndex + 2, meeting.Title);
-                tokenArray[stringIndex + 2] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToString("t", Global.Culture));
-				tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 4, meeting.StartTime.ToString("t", Global.Culture));
-                tokenArray[stringIndex + 4] = new XSigSerialToken(stringIndex + 5, meeting.EndTime.ToString("t", Global.Culture));
-				tokenArray[stringIndex + 5] = new XSigSerialToken(stringIndex + 6, meeting.EndTime.ToString("t", Global.Culture));
+				tokenArray[stringIndex + 2] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToShortDateString());
+				tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 4, meeting.StartTime.ToShortTimeString());
+				tokenArray[stringIndex + 4] = new XSigSerialToken(stringIndex + 5, meeting.EndTime.ToShortDateString());
+				tokenArray[stringIndex + 5] = new XSigSerialToken(stringIndex + 6, meeting.EndTime.ToShortTimeString());
 				tokenArray[stringIndex + 6] = new XSigSerialToken(stringIndex + 7, meeting.Id);
 
 

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

@@ -236,6 +236,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
+		/// <summary>
+		/// Used to be able to inplement IInvitableContact on DirectoryContact
+		/// </summary>
+		public class ZoomDirectoryContact : DirectoryContact, IInvitableContact
+		{
+
+		}
+
 		public class Phonebook
 		{
 			[JsonProperty("Contacts")]
@@ -268,9 +276,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				if (zoomRooms.Count > 0)
 				{
 					// If so, setup a rooms and contacts folder and add them.
-
-                    directory.ResultsFolderId = "root";
-
 					roomFolder.Name = "Rooms";
 					roomFolder.ParentFolderId = "root";
 					roomFolder.FolderId = "rooms";
@@ -287,16 +292,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 				try
 				{
-                    if (zoomContacts.Count == 0)
+					if (zoomContacts.Count == 0) return directory;
 					{
-                        return directory;
-                    }
-					
 						foreach (Contact c in zoomContacts)
 						{
-						var contact = new InvitableDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
-
-                        contact.ContactMethods.Add(new ContactMethod() { Number = c.Jid, Device = eContactMethodDevice.Video, CallType = eContactMethodCallType.Video, ContactMethodId = c.Jid });
+							var contact = new ZoomDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
 
 							if (folders.Count > 0)
 							{
@@ -308,6 +308,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 						directory.AddContactsToDirectory(contacts);
 					}
+				}
 				catch (Exception e)
 				{
 					Debug.Console(1, "Error converting Zoom Phonebook results to generic: {0}", e);
@@ -919,15 +920,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			PhoneCallStatus_InCall,
 			PhoneCallStatus_Init,
 		}
-
-        public class MeetingNeedsPassword
-        {
-            [JsonProperty("needsPassword")]
-            public bool NeedsPassword { get; set; }
-
-            [JsonProperty("wrongAndRetry")]
-            public bool WrongAndRetry { get; set; }
-        }
 	}
 
 	/// <summary>
@@ -1169,11 +1161,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				}
 				set
 				{
-					//if (value != _hideConfSelfVideo)
-					//{
+					if (value != _hideConfSelfVideo)
+					{
 						_hideConfSelfVideo = value;
 						NotifyPropertyChanged("HideConfSelfVideo");
-					//}
+					}
 				}
 			}
 

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

@@ -3,11 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
+using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro.CrestronThread;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
+using PepperDash.Core.Intersystem.Tokens;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
@@ -24,12 +26,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 	public class ZoomRoom : VideoCodecBase, IHasCodecSelfView, IHasDirectoryHistoryStack, ICommunicationMonitor,
 		IRouting,
 		IHasScheduleAwareness, IHasCodecCameras, IHasParticipants, IHasCameraOff, IHasCameraMute, IHasCameraAutoMode,
-		IHasFarEndContentStatus, IHasSelfviewPosition, IHasPhoneDialing, IHasZoomRoomLayouts, IHasParticipantPinUnpin,
-		IHasParticipantAudioMute, IHasSelfviewSize, IPasswordPrompt, IHasStartMeeting
+		IHasFarEndContentStatus, IHasSelfviewPosition, IHasPhoneDialing, IHasZoomRoomLayouts, IHasParticipantPinUnpin, IHasParticipantAudioMute, IHasSelfviewSize
 	{
 		private const long MeetingRefreshTimer = 60000;
-        public uint DefaultMeetingDurationMin { get; private set; }
-
+		private const uint DefaultMeetingDurationMin = 30;
 		private const string Delimiter = "\x0D\x0A";
 
         private readonly GenericQueue _receiveQueue;
@@ -46,15 +46,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		private StringBuilder _jsonMessage;
 		private int _previousVolumeLevel;
 		private CameraBase _selectedCamera;
-        private string _lastDialedMeetingNumber;
 
 		private readonly ZoomRoomPropertiesConfig _props;
 
 		public ZoomRoom(DeviceConfig config, IBasicCommunication comm)
 			: base(config)
 		{
-            DefaultMeetingDurationMin = 30;
-
 			_props = JsonConvert.DeserializeObject<ZoomRoomPropertiesConfig>(config.Properties.ToString());
 
             _receiveQueue = new GenericQueue(Key + "-rxQueue", Thread.eThreadPriority.MediumPriority, 512);
@@ -141,6 +138,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			ContentSwappedWithThumbnailFeedback = new BoolFeedback(ContentSwappedWithThumbnailFeedbackFunc);
 
 			NumberOfScreensFeedback = new IntFeedback(NumberOfScreensFeedbackFunc);
+
 		}
 
 		public CommunicationGather PortGather { get; private set; }
@@ -165,8 +163,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                     if (Configuration.Audio.Output.Volume != 0)
                     {
-						Debug.Console(2, this, "Storing previous volume level as: {0}, scaled: {1}", Configuration.Audio.Output.Volume,
-							scaledVol);
+                        Debug.Console(2, this, "Storing previous volume level as: {0}, scaled: {1}", Configuration.Audio.Output.Volume, scaledVol);
                         _previousVolumeLevel = scaledVol; // Store the previous level for recall
                     }
 
@@ -332,11 +329,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public BoolFeedback SelfviewIsOnFeedback { get; private set; }
 
-		public void GetSelfViewMode()
-		{
-			SendText("zConfiguration Video hide_conf_self_video");
-		}
-
 		public void SelfViewModeOn()
 		{
 			SendText("zConfiguration Video hide_conf_self_video: off");
@@ -369,17 +361,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		public CodecDirectory CurrentDirectoryResult
 		{
 			get { return _currentDirectoryResult; }
-			private set
-			{
-				_currentDirectoryResult = value;
-
-				Debug.Console(2, this, "CurrentDirectoryResult Updated.  ResultsFolderId: {0}",
-					_currentDirectoryResult.ResultsFolderId);
-
-				CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
-
-				OnDirectoryResultReturned(_currentDirectoryResult);
-			}
 		}
 
 		public CodecPhonebookSyncState PhonebookSyncState { get; private set; }
@@ -393,7 +374,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					c => c.Name.IndexOf(searchString, 0, StringComparison.OrdinalIgnoreCase) > -1));
 
 			DirectoryBrowseHistoryStack.Clear();
-			CurrentDirectoryResult = directoryResults;
+			_currentDirectoryResult = directoryResults;
+
+			OnDirectoryResultReturned(directoryResults);
 		}
 
 		public void GetDirectoryFolderContents(string folderId)
@@ -405,14 +388,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			DirectoryBrowseHistoryStack.Push(_currentDirectoryResult);
 
-			CurrentDirectoryResult = directoryResults;
+			_currentDirectoryResult = directoryResults;
+
+			OnDirectoryResultReturned(directoryResults);
 		}
 
 		public void SetCurrentDirectoryToRoot()
 		{
 			DirectoryBrowseHistoryStack.Clear();
 
-			CurrentDirectoryResult = DirectoryRoot;
+			_currentDirectoryResult = DirectoryRoot;
+
+			OnDirectoryResultReturned(DirectoryRoot);
 		}
 
 		public void GetDirectoryParentFolderContents()
@@ -424,7 +411,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			var currentDirectory = DirectoryBrowseHistoryStack.Pop();
 
-			CurrentDirectoryResult = currentDirectory;
+			_currentDirectoryResult = currentDirectory;
+
+			OnDirectoryResultReturned(currentDirectory);
 		}
 
 		public BoolFeedback CurrentDirectoryResultIsNotDirectoryRoot { get; private set; }
@@ -562,6 +551,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 						break;
 					}
+
 				}
 			};
 
@@ -588,6 +578,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             LocalLayoutFeedback.FireUpdate();
                             break;
                         }
+
                 }
             };
 
@@ -689,14 +680,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		private void SetUpDirectory()
 		{
-			DirectoryRoot = new CodecDirectory() {ResultsFolderId = "root"};
+			DirectoryRoot = new CodecDirectory();
 
-			CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => CurrentDirectoryResult.ResultsFolderId != "root");
-
-			CurrentDirectoryResult = DirectoryRoot;
+            _currentDirectoryResult = DirectoryRoot;
 
 			DirectoryBrowseHistory = new List<CodecDirectory>();
 			DirectoryBrowseHistoryStack = new Stack<CodecDirectory>();
+
+			CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => _currentDirectoryResult != DirectoryRoot);
+
+			CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
 		}
 
 		private void SetUpRouting()
@@ -734,7 +727,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				ConsoleAccessLevelEnum.AccessOperator);
 			if (!_props.DisablePhonebookAutoDownload)
 			{
-				CrestronConsole.AddNewConsoleCommand(s => SendText("zCommand Phonebook List Offset: 0 Limit: 10000"),
+				CrestronConsole.AddNewConsoleCommand(s => SendText("zCommand Phonebook List Offset: 0 Limit: 512"),
 					"GetZoomRoomContacts", "Triggers a refresh of the codec phonebook",
 					ConsoleAccessLevelEnum.AccessOperator);
 			}
@@ -771,12 +764,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			if (s == "1")
 			{
 				CommDebuggingIsOn = true;
-				Debug.Console(1, this, "Comm Debug Enabled.");
+				Debug.Console(0, this, "Comm Debug Enabled.");
 			}
 			else
 			{
 				CommDebuggingIsOn = false;
-				Debug.Console(1, this, "Comm Debug Disabled.");
+				Debug.Console(0, this, "Comm Debug Disabled.");
 			}
 		}
 
@@ -864,7 +857,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			if (!_props.DisablePhonebookAutoDownload)
 			{
-				_syncState.AddQueryToQueue("zCommand Phonebook List Offset: 0 Limit: 10000");
+				_syncState.AddQueryToQueue("zCommand Phonebook List Offset: 0 Limit: 512");
 			}
 
 			_syncState.AddQueryToQueue("zCommand Bookings List");
@@ -884,7 +877,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			// Counts the curly braces
 			if (message.Contains("client_loop: send disconnect: Broken pipe"))
 			{
-				Debug.Console(1, this, Debug.ErrorLogLevel.Error,
+				Debug.Console(0, this, Debug.ErrorLogLevel.Error,
 					"Zoom Room Controller or App connected. Essentials will NOT control the Zoom Room until it is disconnected.");
 
 				return;
@@ -1070,30 +1063,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 									}
 								case "phonebooklistresult":
 									{
-								//  This result will always be the complete contents of the directory and never
-								//  A subset of the results via a search
-
 										JsonConvert.PopulateObject(responseObj.ToString(), Status.Phonebook);
 
-								var directoryResults =
-									zStatus.Phonebook.ConvertZoomContactsToGeneric(Status.Phonebook.Contacts);
-
 										if (!PhonebookSyncState.InitialSyncComplete)
 										{
 											PhonebookSyncState.InitialPhonebookFoldersReceived();
 											PhonebookSyncState.PhonebookRootEntriesReceived();
-									PhonebookSyncState.SetPhonebookHasFolders(true);
+											PhonebookSyncState.SetPhonebookHasFolders(false);
 											PhonebookSyncState.SetNumberOfContacts(Status.Phonebook.Contacts.Count);
 										}
 
-								if (directoryResults.ResultsFolderId != "root")
-								{
-									directoryResults.ResultsFolderId = "root";
-								}
+										var directoryResults =
+											zStatus.Phonebook.ConvertZoomContactsToGeneric(Status.Phonebook.Contacts);
 
 										DirectoryRoot = directoryResults;
 
-								CurrentDirectoryResult = directoryResults;
+										_currentDirectoryResult = DirectoryRoot;
+
+										OnDirectoryResultReturned(directoryResults);
 
 										break;
 									}
@@ -1118,13 +1105,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 													if (participant != null)
 													{
-											Debug.Console(1, this,
-												"[DeserializeResponse] zCommands.listparticipantresult - participant.event: {0} **********************************",
-												participant.Event);
-											Debug.Console(1, this,
-												"[DeserializeResponse] zCommands.listparticipantresult - participant.event: {0} - UserId: {1} Name: {2} IsHost: {3}",
-												participant.Event, participant.UserId, participant.UserName, participant.IsHost);
-
 														switch (participant.Event)
 														{
 															case "ZRCUserChangedEventUserInfoUpdated":
@@ -1150,35 +1130,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 																}
 																break;
 															case "ZRCUserChangedEventJoinedMeeting":
-												{
-													var existingParticipant =
-														Status.Call.Participants.FirstOrDefault(p => p.UserId.Equals(participant.UserId));
-
-													if (existingParticipant != null)
-													{
-														Debug.Console(1, this,
-															"[DeserializeResponse] zCommands.listparticipantresult - participant.event: {0} ...updating matching UserId participant with UserId: {1} UserName: {2}",
-															participant.Event, participant.UserId, participant.UserName);
-
-														JsonConvert.PopulateObject(responseObj.ToString(), existingParticipant);
-													}
-													else
-													{
-														Debug.Console(1, this,
-															"[DeserializeResponse] zCommands.listparticipantresult - participant.event: {0} ...adding participant with UserId: {1} UserName: {2}",
-															participant.Event, participant.UserId, participant.UserName);
-
 																Status.Call.Participants.Add(participant);
-													}
-
 																break;
 														}
 													}
-
-											Debug.Console(1, this,
-												"[DeserializeResponse] zCommands.listparticipantresult - participant.event: {0} ***********************************",
-												participant.Event);
-										}
 												}
 												break;
 										}
@@ -1188,6 +1143,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 												Status.Call.Participants);
 
 										Participants.CurrentParticipants = participants;
+
 										PrintCurrentCallParticipants();
 
 										break;
@@ -1280,7 +1236,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 											{
 												Direction = eCodecCallDirection.Incoming,
 												Status = eCodecCallStatus.Ringing,
-										Type = eCodecCallType.Video,
+												Type = eCodecCallType.Unknown,
 												Name = incomingCall.callerName,
 												Id = incomingCall.callerJID
 											};
@@ -1321,11 +1277,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 										var disconnectEvent =
 											JsonConvert.DeserializeObject<zEvent.CallDisconnect>(responseObj.ToString());
 
-								Debug.Console(1, this,
-									"[DeserializeResponse] zEvent.calldisconnect ********************************************");
-								Debug.Console(1, this, "[DeserializeResponse] zEvent.calldisconnect - disconnectEvent.Successful: {0}",
-									disconnectEvent.Successful);
-
 										if (disconnectEvent.Successful)
 										{
 											if (ActiveCalls.Count > 0)
@@ -1334,19 +1285,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 												if (activeCall != null)
 												{
-											Debug.Console(1, this,
-												"[DeserializeResponse] zEvent.calldisconnect - ActiveCalls.Count: {0} activeCall.Id: {1}, activeCall.Number: {2} activeCall.Name: {3}, activeCall.IsActive: {4}",
-												ActiveCalls.Count, activeCall.Id, activeCall.Number, activeCall.Name, activeCall.IsActiveCall);
 													activeCall.Status = eCodecCallStatus.Disconnected;
 
 													OnCallStatusChange(activeCall);
 												}
 											}
+											var emptyList = new List<Participant>();
+											Participants.CurrentParticipants = emptyList;
 										}
 
-								Debug.Console(1, this,
-									"[DeserializeResponse] zEvent.calldisconnect ********************************************");
-
 										UpdateCallStatus();
 										break;
 									}
@@ -1362,20 +1309,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 									}
 								case "meetingneedspassword":
 									{
-                                var meetingNeedsPassword =
-                                    responseObj.ToObject<zEvent.MeetingNeedsPassword>();
-
-                                if (meetingNeedsPassword.NeedsPassword)
-                                {
-                                    var prompt = "Password required to join this meeting.  Please enter the meeting password.";
-
-                                    OnPasswordRequired(meetingNeedsPassword.WrongAndRetry, false, false, prompt);
-                                }
-                                else
-                                {
-                                    OnPasswordRequired(false, false, true, "");
-                                }
-
+										// TODO: notify user to enter a password
 										break;
 									}
 								case "needwaitforhost":
@@ -1410,23 +1344,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 									{
 										var status = responseObj.ToObject<zEvent.PinStatusOfScreenNotification>();
 
-								Debug.Console(1, this, "Pin Status notification for UserId: {0}, ScreenIndex: {1}", status.PinnedUserId,
-									status.ScreenIndex);
+                                        Debug.Console(1, this, "Pin Status notification for UserId: {0}, ScreenIndex: {1}", status.PinnedUserId, status.ScreenIndex);
 
                                         Participant alreadyPinnedParticipant = null;
 
                                         // Check for a participant already pinned to the same screen index.
                                         if (status.PinnedUserId > 0)
                                         {
-									alreadyPinnedParticipant =
-										Participants.CurrentParticipants.FirstOrDefault(p => p.ScreenIndexIsPinnedToFb.Equals(status.ScreenIndex));
+                                            alreadyPinnedParticipant = Participants.CurrentParticipants.FirstOrDefault(p => p.ScreenIndexIsPinnedToFb.Equals(status.ScreenIndex));
 
                                             // Make sure that the already pinned participant isn't the same ID as for this message.  If true, clear the pinned fb.
                                             if (alreadyPinnedParticipant != null && alreadyPinnedParticipant.UserId != status.PinnedUserId)
                                             {
                                                 Debug.Console(1, this, "Participant: {0} with id: {1} already pinned to screenIndex {2}.  Clearing pinned fb.",
-											alreadyPinnedParticipant.Name, alreadyPinnedParticipant.UserId,
-											alreadyPinnedParticipant.ScreenIndexIsPinnedToFb);
+                                                    alreadyPinnedParticipant.Name, alreadyPinnedParticipant.UserId, alreadyPinnedParticipant.ScreenIndexIsPinnedToFb);
                                                 alreadyPinnedParticipant.IsPinnedFb = false;
                                                 alreadyPinnedParticipant.ScreenIndexIsPinnedToFb = -1;
                                             }
@@ -1441,19 +1372,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 										}
 										else
 										{
-									participant =
-										Participants.CurrentParticipants.FirstOrDefault(p => p.ScreenIndexIsPinnedToFb.Equals(status.ScreenIndex));
+											participant = Participants.CurrentParticipants.FirstOrDefault(p => p.ScreenIndexIsPinnedToFb.Equals(status.ScreenIndex));
 
 											if (participant == null && alreadyPinnedParticipant == null)
 											{
-										Debug.Console(1, this, "no matching participant found by pinned_user_id: {0} or screen_index: {1}",
-											status.PinnedUserId, status.ScreenIndex);
+												Debug.Console(1, this, "no matching participant found by pinned_user_id: {0} or screen_index: {1}", status.PinnedUserId, status.ScreenIndex);
 												return;
 											}
 											else if (participant != null)
 											{
-										Debug.Console(2, this, "Unpinning {0} with id: {1} from screen index: {2}", participant.Name,
-											participant.UserId, status.ScreenIndex);
+                                                Debug.Console(2, this, "Unpinning {0} with id: {1} from screen index: {2}", participant.Name, participant.UserId, status.ScreenIndex);
 												participant.IsPinnedFb = false;
 												participant.ScreenIndexIsPinnedToFb = -1;
 											}
@@ -1498,16 +1426,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 									{
 										JsonConvert.PopulateObject(responseObj.ToString(), Status.Call);
 
-								Debug.Console(1, this,
-									"[DeserializeResponse] zStatus.call - Status.Call.Info.meeting_id: {0} Status.Call.Info.meeting_list_item.meetingName: {1}",
-									Status.Call.Info.meeting_id, Status.Call.Info.meeting_list_item.meetingName);
-								foreach (var participant in Status.Call.Participants)
-								{
-									Debug.Console(1, this,
-										"[DeserializeResponse] zStatus.call - Status.Call.Participants participant.UserId: {0} participant.UserName: {1}",
-										participant.UserId, participant.UserName);
-								}
-
 										UpdateCallStatus();
 
 										break;
@@ -1603,26 +1521,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
-		/// <summary>
-		/// Retrieves the current call participants list
-		/// </summary>
-		public void GetCurrentCallParticipants()
-		{
-			SendText("zCommand Call ListParticipants");
-		}
-
-		/// <summary>
-		/// Prints the current call particiapnts list
-		/// </summary>
 		public void PrintCurrentCallParticipants()
 		{
-			if (Debug.Level <= 0) return;
+			if (Debug.Level <= 0)
+			{
+				return;
+			}
 
 			Debug.Console(1, this, "*************************** Call Participants **************************");
 			foreach (var participant in Participants.CurrentParticipants)
 			{
-				Debug.Console(1, this, "UserId: {3} Name: {0} Audio: {1} IsHost: {2}",
-					participant.Name, participant.AudioMuteFb, participant.IsHost, participant.UserId);
+				Debug.Console(1, this, "Name: {0} Audio: {1} IsHost: {2}", participant.Name,
+					participant.AudioMuteFb, participant.IsHost);
 			}
 			Debug.Console(1, this, "************************************************************************");
 		}
@@ -1642,16 +1552,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		private void UpdateCallStatus()
 		{
 			Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
-				Status.Call != null ? Status.Call.Status.ToString() : "no call");
+				Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
 
 			if (Status.Call != null)
 			{
 				var callStatus = Status.Call.Status;
 
-				// If not crrently in a meeting, intialize the call object
+				// If not currently in a meeting, intialize the call object
 				if (callStatus != zStatus.eCallStatus.IN_MEETING && callStatus != zStatus.eCallStatus.CONNECTING_MEETING)
 				{
-					Debug.Console(1, this, "[UpdateCallStatus] Creating new Status.Call object");
+					Debug.Console(1, this, "Creating new Status.Call object");
 					Status.Call = new zStatus.Call { Status = callStatus };
 
                     OnCallStatusChange( new CodecActiveCallItem() { Status = eCodecCallStatus.Disconnected });
@@ -1676,30 +1586,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								break;
 						}
 
-						if (!string.IsNullOrEmpty(Status.Call.Info.meeting_id))
-						{
 						var newCall = new CodecActiveCallItem 
                         {
                             Name = Status.Call.Info.meeting_list_item.meetingName,
-								Number = Status.Call.Info.meeting_list_item.meetingNumber,
                             Id = Status.Call.Info.meeting_id,
-								Status = newStatus,
-								Type = eCodecCallType.Video,
+                            Status = newStatus 
                         };
 
 						ActiveCalls.Add(newCall);
 
-							Debug.Console(1, this, "[UpdateCallStatus] IF w/ meeting_id AcitveCalls.Count == {1} - Current Call Status: {0}",
-								Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
+						Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
+							Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
 
 						OnCallStatusChange(newCall);
 					}
-						else
-						{
-							Debug.Console(1, this, "[UpdateCallStatus] IF w/o meeting_id AcitveCalls.Count == {1} - Current Call Status: {0}",
-								Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
-						}
-					}
+
+
 				}
 				else
 				{
@@ -1715,14 +1617,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							break;
 					}
 
-					Debug.Console(1, this, "[UpdateCallStatus] ELSE ActiveCalls.Count == {1} - Current Call Status: {0}",
-						Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
+					Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
+						Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
 
 					OnCallStatusChange(existingCall);
 				}
 			}
 
-			Debug.Console(1, this, "[UpdateCallStatus] Active Calls ------------------------------");
+			Debug.Console(1, this, "*************************** Active Calls ********************************");
 
 			// Clean up any disconnected calls left in the list
 			for (int i = 0; i < ActiveCalls.Count; i++)
@@ -1730,27 +1632,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				var call = ActiveCalls[i];
 
 				Debug.Console(1, this,
-					@"ID: {1}
-					Number: {5}
-					Name: {0}                    
+					@"Name: {0}
+                    ID: {1}
                     IsActive: {2}
                     Status: {3}
-                    Direction: {4}
-					IsActiveCall: {6}", call.Name, call.Id, call.IsActiveCall, call.Status, call.Direction, call.Number,
-					call.IsActiveCall);
+                    Direction: {4}", call.Name, call.Id, call.IsActiveCall, call.Status, call.Direction);
 
 				if (!call.IsActiveCall)
 				{
-					Debug.Console(1, this, "[UpdateCallStatus] Removing Inactive call.Id: {1} call.Name: {0}", call.Name, call.Id);
+					Debug.Console(1, this, "***** Removing Inactive Call: {0} *****", call.Name);
 					ActiveCalls.Remove(call);
 				}
 			}
-			Debug.Console(1, this, "[UpdateCallStatus] Active Calls ------------------------------");
+			Debug.Console(1, this, "**************************************************************************");
 
 			//clear participants list after call cleanup
+			if (ActiveCalls.Count == 0)
+			{
                 var emptyList = new List<Participant>();
 				Participants.CurrentParticipants = emptyList;
-			if (ActiveCalls.Count > 0) GetCurrentCallParticipants();
+			}
 		}
 
 		protected override void OnCallStatusChange(CodecActiveCallItem item)
@@ -1758,7 +1659,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			base.OnCallStatusChange(item);
 
 			Debug.Console(1, this, "[OnCallStatusChange] Current Call Status: {0}",
-				Status.Call != null ? Status.Call.Status.ToString() : "no call");
+				Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
 
 			if (_props.AutoDefaultLayouts)
 			{
@@ -1809,6 +1710,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public override void MuteOn()
 		{
+
 			SetVolume(0);
 		}
 
@@ -1910,20 +1812,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				layoutsCodec.AvailableLayoutsChanged += (o, a) =>
 				{
 					trilist.SetBool(joinMap.LayoutGalleryIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Gallery
-					                                                             ==
-					                                                             (a.AvailableLayouts &
-					                                                              zConfiguration.eLayoutStyle.Gallery));
+						== (a.AvailableLayouts & zConfiguration.eLayoutStyle.Gallery));
 					trilist.SetBool(joinMap.LayoutSpeakerIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Speaker
-					                                                             ==
-					                                                             (a.AvailableLayouts &
-					                                                              zConfiguration.eLayoutStyle.Speaker));
+						== (a.AvailableLayouts & zConfiguration.eLayoutStyle.Speaker));
 					trilist.SetBool(joinMap.LayoutStripIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Strip
-					                                                           ==
-					                                                           (a.AvailableLayouts & zConfiguration.eLayoutStyle.Strip));
+						== (a.AvailableLayouts & zConfiguration.eLayoutStyle.Strip));
 					trilist.SetBool(joinMap.LayoutShareAllIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.ShareAll
-					                                                              ==
-					                                                              (a.AvailableLayouts &
-					                                                               zConfiguration.eLayoutStyle.ShareAll));
+						== (a.AvailableLayouts & zConfiguration.eLayoutStyle.ShareAll));
 
 					// pass the names used to set the layout through the bridge
 					trilist.SetString(joinMap.LayoutGalleryIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Gallery.ToString());
@@ -1934,13 +1829,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				
 				trilist.SetSigFalseAction(joinMap.SwapContentWithThumbnail.JoinNumber, () => layoutsCodec.SwapContentWithThumbnail());
 
-				layoutsCodec.CanSwapContentWithThumbnailFeedback.LinkInputSig(
-					trilist.BooleanInput[joinMap.CanSwapContentWithThumbnail.JoinNumber]);
-				layoutsCodec.ContentSwappedWithThumbnailFeedback.LinkInputSig(
-					trilist.BooleanInput[joinMap.SwapContentWithThumbnail.JoinNumber]);
+				layoutsCodec.CanSwapContentWithThumbnailFeedback.LinkInputSig(trilist.BooleanInput[joinMap.CanSwapContentWithThumbnail.JoinNumber]);
+				layoutsCodec.ContentSwappedWithThumbnailFeedback.LinkInputSig(trilist.BooleanInput[joinMap.SwapContentWithThumbnail.JoinNumber]);
 
-				layoutsCodec.LayoutViewIsOnFirstPageFeedback.LinkInputSig(
-					trilist.BooleanInput[joinMap.LayoutIsOnFirstPage.JoinNumber]);
+				layoutsCodec.LayoutViewIsOnFirstPageFeedback.LinkInputSig(trilist.BooleanInput[joinMap.LayoutIsOnFirstPage.JoinNumber]);
 				layoutsCodec.LayoutViewIsOnLastPageFeedback.LinkInputSig(trilist.BooleanInput[joinMap.LayoutIsOnLastPage.JoinNumber]);
 				trilist.SetSigFalseAction(joinMap.LayoutTurnToNextPage.JoinNumber, () => layoutsCodec.LayoutTurnNextPage());
 				trilist.SetSigFalseAction(joinMap.LayoutTurnToPreviousPage.JoinNumber, () => layoutsCodec.LayoutTurnPreviousPage());
@@ -2067,21 +1959,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public override void Dial(string number)
 		{
-            _lastDialedMeetingNumber = number;
 			SendText(string.Format("zCommand Dial Join meetingNumber: {0}", number));
 		}
 
-        /// <summary>
-        /// Dials a meeting with a password
-        /// </summary>
-        /// <param name="number"></param>
-        /// <param name="password"></param>
-        public void Dial(string number, string password)
-        {
-            Debug.Console(2, this, "Dialing meeting number: {0} with password: {1}", number, password);
-            SendText(string.Format("zCommand Dial Join meetingNumber: {0} password: {1}", number, password));
-        }
-
 		/// <summary>
 		/// Invites a contact to either a new meeting (if not already in a meeting) or the current meeting.
 		/// Currently only invites a single user
@@ -2089,7 +1969,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		/// <param name="contact"></param>
 		public override void Dial(IInvitableContact contact)
 		{
-            var ic = contact as InvitableDirectoryContact;
+			var ic = contact as zStatus.ZoomDirectoryContact;
 
 			if (ic != null)
 			{
@@ -2107,21 +1987,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
-
-        /// <summary>
-        /// Starts a PMI Meeting for the specified duration (or default meeting duration if 0 is specified)
-        /// </summary>
-        /// <param name="duration">duration of meeting</param>
-        public void StartMeeting(uint duration)
-        {
-            uint dur = DefaultMeetingDurationMin;
-
-            if (duration > 0)
-                dur = duration;
-
-            SendText(string.Format("zCommand Dial StartPmi Duration: {0}", dur));
-        }
-
 		public override void EndCall(CodecActiveCallItem call)
 		{
 			SendText("zCommand Call Disconnect");
@@ -2143,29 +2008,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		/// <param name="result"></param>
 		private void OnDirectoryResultReturned(CodecDirectory result)
 		{
-			try
-			{
-				Debug.Console(2, this, "OnDirectoryResultReturned");
-
-				var directoryResult = new CodecDirectory();
-
-				// If result is Root, create a copy and filter out contacts whose parent folder is not root
-				if (!CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
-				{
-					Debug.Console(2, this, "Filtering DirectoryRoot to remove contacts for display");
-
-					directoryResult.ResultsFolderId = result.ResultsFolderId;
-					directoryResult.AddFoldersToDirectory(result.Folders);
-					directoryResult.AddContactsToDirectory(
-						result.Contacts.Where((c) => c.ParentFolderId == result.ResultsFolderId).ToList());
-				}
-				else
-				{
-					directoryResult = result;
-				}
-
-				Debug.Console(2, this, "Updating directoryResult. IsOnRoot: {0}",
-					!CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
+			CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
 
 			// This will return the latest results to all UIs.  Multiple indendent UI Directory browsing will require a different methodology
 			var handler = DirectoryResultReturned;
@@ -2173,15 +2016,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			{
 				handler(this, new DirectoryEventArgs
 				{
-						Directory = directoryResult,
+					Directory = result,
 					DirectoryIsOnRoot = !CurrentDirectoryResultIsNotDirectoryRoot.BoolValue
 				});
 			}
-			}
-			catch (Exception e)
-			{
-				Debug.Console(2, this, "Error: {0}", e);
-			}
 
 			//PrintDirectory(result);
 		}
@@ -2309,10 +2147,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		#region IHasParticipantPinUnpin Members
 
-		private Func<int> NumberOfScreensFeedbackFunc
-		{
-			get { return () => Status.NumberOfScreens.NumOfScreens; }
-		}
+		private Func<int> NumberOfScreensFeedbackFunc { get { return () => Status.NumberOfScreens.NumOfScreens; } }
 
 		public IntFeedback NumberOfScreensFeedback { get; private set; }
 
@@ -2454,7 +2289,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		#endregion
 
 		// TODO: #714 [ ] Implementation of IHasSelfviewPipSize
-
 		#region Implementation of IHasSelfviewPipSize
 
 		private CodecCommandWithLabel _currentSelfviewPipSize;
@@ -2496,24 +2330,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					p => p.Command.ToLower().Equals(Configuration.Call.Layout.Size.ToString().ToLower()));
 		}
 
+
 		#endregion
 
 		#region Implementation of IHasPhoneDialing
 
-		private Func<bool> PhoneOffHookFeedbackFunc
-		{
-			get { return () => Status.PhoneCall.OffHook; }
-		}
-
-		private Func<string> CallerIdNameFeedbackFunc
-		{
-			get { return () => Status.PhoneCall.PeerDisplayName; }
-		}
-
-		private Func<string> CallerIdNumberFeedbackFunc
-		{
-			get { return () => Status.PhoneCall.PeerNumber; }
-		}
+		private Func<bool> PhoneOffHookFeedbackFunc { get { return () => Status.PhoneCall.OffHook; } }
+		private Func<string> CallerIdNameFeedbackFunc { get { return () => Status.PhoneCall.PeerDisplayName; } }
+		private Func<string> CallerIdNumberFeedbackFunc { get { return () => Status.PhoneCall.PeerNumber; } }
 
 		public BoolFeedback PhoneOffHookFeedback { get; private set; }
 		public StringFeedback CallerIdNameFeedback { get; private set; }
@@ -2540,25 +2364,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public event EventHandler<LayoutInfoChangedEventArgs> AvailableLayoutsChanged;
 
-		private Func<bool> LayoutViewIsOnFirstPageFeedbackFunc
-		{
-			get { return () => Status.Layout.is_In_First_Page; }
-		}
-
-		private Func<bool> LayoutViewIsOnLastPageFeedbackFunc
-		{
-			get { return () => Status.Layout.is_In_Last_Page; }
-		}
-
-		private Func<bool> CanSwapContentWithThumbnailFeedbackFunc
-		{
-			get { return () => Status.Layout.can_Switch_Floating_Share_Content; }
-		}
-
-		private Func<bool> ContentSwappedWithThumbnailFeedbackFunc
-		{
-			get { return () => Configuration.Call.Layout.ShareThumb; }
-		}
+		private Func<bool> LayoutViewIsOnFirstPageFeedbackFunc { get { return () => Status.Layout.is_In_First_Page; } }
+		private Func<bool> LayoutViewIsOnLastPageFeedbackFunc { get { return () => Status.Layout.is_In_Last_Page; } }
+		private Func<bool> CanSwapContentWithThumbnailFeedbackFunc { get { return () => Status.Layout.can_Switch_Floating_Share_Content; } }
+		private Func<bool> ContentSwappedWithThumbnailFeedbackFunc { get { return () => Configuration.Call.Layout.ShareThumb; } }
 
 		public BoolFeedback LayoutViewIsOnFirstPageFeedback { get; private set; }
 
@@ -2628,8 +2437,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		{
 			if (CanSwapContentWithThumbnailFeedback.BoolValue)
 			{
-				var oppositeValue = ContentSwappedWithThumbnailFeedback.BoolValue ? "on" : "off";
-					// Get the value based on the opposite of the current state
+				var oppositeValue = ContentSwappedWithThumbnailFeedback.BoolValue ? "on" : "off"; // Get the value based on the opposite of the current state
 				// TODO: #697 [*] Need to verify the ternary above and make sure that the correct on/off value is being send based on the true/false value of the feedback
 				// to toggle the state
 				SendText(String.Format("zConfiguration Call Layout ShareThumb: {0}", oppositeValue));
@@ -2694,8 +2502,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
             zConfiguration.eLayoutStyle nextLayout;
 
-			if (((zConfiguration.eLayoutStyle) currentLayout & zConfiguration.eLayoutStyle.ShareAll) ==
-			    zConfiguration.eLayoutStyle.ShareAll)
+            if (((zConfiguration.eLayoutStyle)currentLayout & zConfiguration.eLayoutStyle.ShareAll) == zConfiguration.eLayoutStyle.ShareAll)
             {
                 nextLayout = zConfiguration.eLayoutStyle.Gallery;
             }
@@ -2726,26 +2533,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		#endregion
 
-        #region IPasswordPrompt Members
-
-        public event EventHandler<PasswordPromptEventArgs> PasswordRequired;
-
-        public void SubmitPassword(string password)
-        {
-            Debug.Console(2, this, "Password Submitted: {0}", password);
-            Dial(_lastDialedMeetingNumber, password);
-        }
-
-        void OnPasswordRequired(bool lastAttemptIncorrect, bool loginFailed, bool loginCancelled, string message)
-        {
-            var handler = PasswordRequired;
-            if (handler != null)
-            {
-                handler(this, new PasswordPromptEventArgs(lastAttemptIncorrect, loginFailed, loginCancelled, message));
-            }
-        }
-
-        #endregion
 	}
 
 	/// <summary>