Fixed debug references used for call status that were printing Status.Call.Sharing.State. Added GetCurrentCallParticipants method to referesh participant list. Updated UpdateCallStatus to resolve issue with duplicate participants when admitted from the waiting room.

feat(essentials): Adds IMobileControl3 interface to maintain backwards compatibility

PepperDashEssentials/ControlSystem.cs

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

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -752,10 +752,10 @@ namespace PepperDash.Essentials
         /// 15044 Close button for source modal overlay
         /// </summary>
         public const uint SourceBackgroundOverlayClosePress = 15044;
-        /// <summary>
-        /// 15045 - Visibility for the bar containing call navigation button list
-        /// </summary>
-        public const uint CallStagingBarVisible = 15045;
+        ///// <summary>
+        ///// 15045 - Visibility for the bar containing call navigation button list
+        ///// </summary>
+        //public const uint CallStagingBarVisible = 15045;
 		/// <summary>
 		/// 15046
 		/// </summary>

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -173,10 +173,28 @@ namespace PepperDash.Essentials
         /// </summary>
         public PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; private set; }
 
+
+        private UiDisplayMode _currentMode;
+
         /// <summary>
         /// The mode showing. Presentation or call.
         /// </summary>
-        UiDisplayMode CurrentMode = UiDisplayMode.Start;
+        UiDisplayMode CurrentMode
+        {
+            get
+            {
+                return _currentMode;
+            }
+            set
+            {
+                if (value != _currentMode)
+                {
+                    _currentMode = value;
+
+                    SetActivityFooterFeedbacks();
+                }
+            }
+        }
 
 		CTimer NextMeetingTimer;
 
@@ -207,6 +225,7 @@ namespace PepperDash.Essentials
 
 			MeetingOrContactMethodModalSrl = new SubpageReferenceList(TriList, UISmartObjectJoin.MeetingListSRL, 3, 3, 5);
 
+            CurrentMode = UiDisplayMode.Start;
 
 			// buttons are added in SetCurrentRoom
 			//HeaderButtonsList = new SmartObjectHeaderButtonList(TriList.SmartObjects[UISmartObjectJoin.HeaderButtonList]);
@@ -607,11 +626,21 @@ namespace PepperDash.Essentials
         /// </summary>
         void SetActivityFooterFeedbacks()
         {
-            CallButtonSig.BoolValue = CurrentMode == UiDisplayMode.Call 
-                && CurrentRoom.ShutdownType == eShutdownType.None;
-            ShareButtonSig.BoolValue = CurrentMode == UiDisplayMode.Presentation 
-                && CurrentRoom.ShutdownType == eShutdownType.None;
-            EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
+            if (CurrentRoom != null)
+            {
+                var startMode = CurrentMode == UiDisplayMode.Start;
+                var presentationMode = CurrentMode == UiDisplayMode.Presentation;
+                var callMode = CurrentMode == UiDisplayMode.Call;
+
+                TriList.SetBool(StartPageVisibleJoin, startMode ? true : false);
+                TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, presentationMode ? true : false);
+
+                CallButtonSig.BoolValue = callMode
+                    && CurrentRoom.ShutdownType == eShutdownType.None;
+                ShareButtonSig.BoolValue = presentationMode
+                    && CurrentRoom.ShutdownType == eShutdownType.None;
+                EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
+            }
         }
 
         /// <summary>
@@ -623,14 +652,13 @@ namespace PepperDash.Essentials
                 return;
             HideLogo();
 			HideNextMeetingPopup();
-            TriList.SetBool(StartPageVisibleJoin, false);
-            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
-            TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
+            //TriList.SetBool(StartPageVisibleJoin, false);
+            //TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
+            //TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
             if (CurrentSourcePageManager != null)
                 CurrentSourcePageManager.Hide();
 			PowerOnFromCall();
             CurrentMode = UiDisplayMode.Call;
-            SetActivityFooterFeedbacks();
             VCDriver.Show();
         }
 
@@ -643,9 +671,6 @@ namespace PepperDash.Essentials
             if (VCDriver.IsVisible)
                 VCDriver.Hide();
 			HideNextMeetingPopup();
-            TriList.SetBool(StartPageVisibleJoin, false);
-            TriList.SetBool(UIBoolJoin.CallStagingBarVisible, false);
-            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, true);
             // Run default source when room is off and share is pressed
             if (!CurrentRoom.OnFeedback.BoolValue)
             { 
@@ -665,7 +690,6 @@ namespace PepperDash.Essentials
             }
             CurrentMode = UiDisplayMode.Presentation;
 			SetupSourceList();
-            SetActivityFooterFeedbacks();
         }
 
 		/// <summary>
@@ -707,6 +731,8 @@ namespace PepperDash.Essentials
 			if (CurrentRoom.CurrentSourceInfo == null)
 				return;
 
+            CurrentMode = UiDisplayMode.Presentation;
+
 			if (CurrentRoom.CurrentSourceInfo.SourceDevice == null)
 			{
 				TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
@@ -1218,9 +1244,8 @@ namespace PepperDash.Essentials
                     VCDriver.Hide();
                 SetupActivityFooterWhenRoomOff();
                 ShowLogo();
-                SetActivityFooterFeedbacks();
-                TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
-                TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
+                //TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
+                //TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
 				// Clear this so that the pesky meeting warning can resurface every minute when off
 				LastMeetingDismissedId = null;
             }

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -1041,22 +1041,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		void SetupDirectoryList()
 		{
 			var codec = Codec as IHasDirectory;
-			if (codec != null)
-			{
-				DirectoryList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCDirectoryList],
-					true, 1300);
-				codec.DirectoryResultReturned += new EventHandler<DirectoryEventArgs>(dir_DirectoryResultReturned);
+		    if (codec == null)
+		    {
+		        return;
+		    }
 
-				if (codec.PhonebookSyncState.InitialSyncComplete)
-					SetCurrentDirectoryToRoot();
-				else
-				{
-					codec.PhonebookSyncState.InitialSyncCompleted += new EventHandler<EventArgs>(PhonebookSyncState_InitialSyncCompleted);
-				}
+		    DirectoryList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCDirectoryList],
+		        true, 1300);
+		    codec.DirectoryResultReturned += dir_DirectoryResultReturned;
 
-			    RefreshDirectory();
-				
-			}
+		    if (codec.PhonebookSyncState.InitialSyncComplete)
+		        SetCurrentDirectoryToRoot();
+		    else
+		    {
+		        codec.PhonebookSyncState.InitialSyncCompleted += PhonebookSyncState_InitialSyncCompleted;
+		    }
 		}
 
         /// <summary>
@@ -1064,11 +1063,15 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void SetCurrentDirectoryToRoot()
         {
-            (Codec as IHasDirectory).SetCurrentDirectoryToRoot();
+            var hasDirectory = Codec as IHasDirectory;
 
+            if (hasDirectory == null)
+            {
+                return;
+            }
+
+            hasDirectory.SetCurrentDirectoryToRoot();
             SearchKeypadClear();
-
-            RefreshDirectory();
         }
 
         /// <summary>
@@ -1080,10 +1083,17 @@ namespace PepperDash.Essentials.UIDrivers.VC
         {
             var codec = Codec as IHasDirectory;
 
-            SetCurrentDirectoryToRoot();
+            if (codec == null)
+            {
+                return;
+            }
 
-            RefreshDirectory();
-            
+            if (!codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
+            {
+                return;
+            }
+
+            SetCurrentDirectoryToRoot();
         }
 
 		/// <summary>
@@ -1093,8 +1103,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <param name="e"></param>
 		void dir_DirectoryResultReturned(object sender, DirectoryEventArgs e)
 		{
-
-			RefreshDirectory();
+		    RefreshDirectory(e.Directory);
 		}
 
         /// <summary>
@@ -1123,16 +1132,27 @@ namespace PepperDash.Essentials.UIDrivers.VC
  
         }
 
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="dir"></param>
-		void RefreshDirectory()
+        /// <summary>
+        /// 
+        /// </summary>
+        void RefreshDirectory()
 		{
-            if ((Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults.Count > 0)
+		    var codec = Codec as IHasDirectory;
+
+		    if (codec == null)
+		    {
+		        return;
+		    }
+
+		    RefreshDirectory(codec.CurrentDirectoryResult);
+		}
+
+        void RefreshDirectory(CodecDirectory directory)
+        {
+            if (directory.CurrentDirectoryResults.Count > 0)
             {
                 ushort i = 0;
-                foreach (var r in (Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults)
+                foreach (var r in directory.CurrentDirectoryResults)
                 {
                     if (i == DirectoryList.MaxCount)
                     {
@@ -1152,19 +1172,33 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             // If more than one contact method, show contact method modal dialog
                             DirectoryList.SetItemButtonAction(i, b =>
                             {
-                                if (!b)
+                                if (b)
                                 {
-                                    // Refresh the contact methods list
-                                    RefreshContactMethodsModalList(dc);
-                                    Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible);
+                                    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
                         {
-                            // If only one contact method, just dial that method
-							DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
+                            Debug.Console(1, "Unable to dial contact.  No availble ContactMethod(s) specified");
                         }
                     }
                     else    // is DirectoryFolder
@@ -1191,8 +1225,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 DirectoryList.SetItemMainText(1, "No Results Found");
             }
-
-		}
+        }
 
         void RefreshContactMethodsModalList(DirectoryContact contact)
         {

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

@@ -13,6 +13,14 @@ 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 Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs

@@ -69,6 +69,22 @@ 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>
@@ -104,6 +120,15 @@ 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>

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

@@ -1,100 +1,108 @@
 using System;
 using System.Collections.Generic;
+using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
 {
-    /// <summary>
-    /// Describes a device that has call participants
-    /// </summary>
-    public interface IHasParticipants
-    {
-        CodecParticipants Participants { get; }
-    }
+	/// <summary>
+	/// Describes a device that has call participants
+	/// </summary>
+	public interface IHasParticipants
+	{
+		CodecParticipants Participants { get; }
+	}
 
-    /// <summary>
-    /// Describes the ability to mute and unmute a participant's video in a meeting
-    /// </summary>
-    public interface IHasParticipantVideoMute:IHasParticipants
-    {
-        void MuteVideoForParticipant(int userId);
-        void UnmuteVideoForParticipant(int userId);
-        void ToggleVideoForParticipant(int userId);
-    }
+	/// <summary>
+	/// Describes the ability to mute and unmute a participant's video in a meeting
+	/// </summary>
+	public interface IHasParticipantVideoMute : IHasParticipants
+	{
+		void MuteVideoForParticipant(int userId);
+		void UnmuteVideoForParticipant(int userId);
+		void ToggleVideoForParticipant(int userId);
+	}
 
-    /// <summary>
-    /// Describes the ability to mute and unmute a participant's audio in a meeting
-    /// </summary>
-    public interface IHasParticipantAudioMute : IHasParticipantVideoMute
-    {
-        void MuteAudioForParticipant(int userId);
-        void UnmuteAudioForParticipant(int userId);
-        void ToggleAudioForParticipant(int userId);
-    }
+	/// <summary>
+	/// Describes the ability to mute and unmute a participant's audio in a meeting
+	/// </summary>
+	public interface IHasParticipantAudioMute : IHasParticipantVideoMute
+	{
+		void MuteAudioForParticipant(int userId);
+		void UnmuteAudioForParticipant(int userId);
+		void ToggleAudioForParticipant(int userId);
+	}
 
-    /// <summary>
-    /// Describes the ability to pin and unpin a participant in a meeting
-    /// </summary>
-    public interface IHasParticipantPinUnpin : IHasParticipants
-    {
-        IntFeedback NumberOfScreensFeedback { get; }
-        int ScreenIndexToPinUserTo { get; }
+	/// <summary>
+	/// Describes the ability to pin and unpin a participant in a meeting
+	/// </summary>
+	public interface IHasParticipantPinUnpin : IHasParticipants
+	{
+		IntFeedback NumberOfScreensFeedback { get; }
+		int ScreenIndexToPinUserTo { get; }
 
-        void PinParticipant(int userId, int screenIndex);
-        void UnPinParticipant(int userId);
-        void ToggleParticipantPinState(int userId, int screenIndex);
-    }
+		void PinParticipant(int userId, int screenIndex);
+		void UnPinParticipant(int userId);
+		void ToggleParticipantPinState(int userId, int screenIndex);
+	}
 
-    public class CodecParticipants
-    {
-        private List<Participant> _currentParticipants;
- 
-        public List<Participant> CurrentParticipants {
-            get { return _currentParticipants; }
-            set
-            {
-                _currentParticipants = value;
-                OnParticipantsChanged();
-            }
-        }
+	public class CodecParticipants
+	{
+		private List<Participant> _currentParticipants;
 
-        public event EventHandler<EventArgs> ParticipantsListHasChanged;
+		public List<Participant> CurrentParticipants
+		{
+			get { return _currentParticipants; }
+			set
+			{
+				_currentParticipants = value;
+				foreach (var participant in _currentParticipants)
+				{
+					Debug.Console(1, "[CurrentParticipants] participant UserId: {0} Name: {1} IsHost: {2}", participant.UserId, participant.Name, participant.IsHost);	
+				}
+				OnParticipantsChanged();
+			}
+		}
 
-        public CodecParticipants()
-        {
-            _currentParticipants = new List<Participant>();
-        }
+		public event EventHandler<EventArgs> ParticipantsListHasChanged;
 
-        public void OnParticipantsChanged()
-        {
-            var handler = ParticipantsListHasChanged;
+		public CodecParticipants()
+		{
+			_currentParticipants = new List<Participant>();
+		}
 
-            if (handler == null) return;
+		public void OnParticipantsChanged()
+		{
+			var handler = ParticipantsListHasChanged;
 
-            handler(this, new EventArgs());
-        }
-    }
+			Debug.Console(1, "[OnParticipantsChanged] Event Fired - handler is {0}", handler == null ? "null" : "not null");
 
-    /// <summary>
-    /// Represents a call participant
-    /// </summary>
-    public class Participant
-    {
-        public int UserId { get; set; }
-        public bool IsHost { get; set; }
-        public string Name { get; set; }
-        public bool CanMuteVideo { get; set; }       
-        public bool CanUnmuteVideo { get; set; }
-        public bool VideoMuteFb { get; set; }
-        public bool AudioMuteFb { get; set; }
-        public bool HandIsRaisedFb { get; set; }
-        public bool IsPinnedFb { get; set; }
-        public int ScreenIndexIsPinnedToFb { get; set; }
+			if (handler == null) return;
 
-        public Participant()
-        {
-            // Initialize to -1 (no screen)
-            ScreenIndexIsPinnedToFb = -1;
-        }
-    }
+			handler(this, new EventArgs());
+		}
+	}
+
+	/// <summary>
+	/// Represents a call participant
+	/// </summary>
+	public class Participant
+	{
+		public int UserId { get; set; }
+		public bool IsHost { get; set; }
+		public string Name { get; set; }
+		public bool CanMuteVideo { get; set; }
+		public bool CanUnmuteVideo { get; set; }
+		public bool VideoMuteFb { get; set; }
+		public bool AudioMuteFb { get; set; }
+		public bool HandIsRaisedFb { get; set; }
+		public bool IsPinnedFb { get; set; }
+		public int ScreenIndexIsPinnedToFb { get; set; }
+
+		public Participant()
+		{
+			// Initialize to -1 (no screen)
+			ScreenIndexIsPinnedToFb = -1;
+		}
+	}
 }

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

@@ -276,6 +276,9 @@ 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";
@@ -292,22 +295,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 				try
 				{
-					if (zoomContacts.Count == 0) return directory;
+                    if (zoomContacts.Count == 0)
+                    {
+                        return directory;
+                    }
+					
+					foreach (Contact c in zoomContacts)
 					{
-						foreach (Contact c in zoomContacts)
+						var contact = new ZoomDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
+
+                        contact.ContactMethods.Add(new ContactMethod() { Number = c.Jid, Device = eContactMethodDevice.Video, CallType = eContactMethodCallType.Video, ContactMethodId = c.Jid });
+
+						if (folders.Count > 0)
 						{
-							var contact = new ZoomDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
-
-							if (folders.Count > 0)
-							{
-								contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
-							}
-
-							contacts.Add(contact);
+							contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
 						}
 
-						directory.AddContactsToDirectory(contacts);
+						contacts.Add(contact);
 					}
+
+					directory.AddContactsToDirectory(contacts);
 				}
 				catch (Exception e)
 				{
@@ -1161,11 +1168,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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO.Ports;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
@@ -32,11 +33,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		private const uint DefaultMeetingDurationMin = 30;
 		private const string Delimiter = "\x0D\x0A";
 
-        private readonly GenericQueue _receiveQueue;
-        //private readonly CrestronQueue<string> _receiveQueue;
+		private readonly GenericQueue _receiveQueue;
+		//private readonly CrestronQueue<string> _receiveQueue;
 
 
-        //private readonly Thread _receiveThread;
+		//private readonly Thread _receiveThread;
 
 		private readonly ZoomRoomSyncState _syncState;
 		public bool CommDebuggingIsOn;
@@ -54,7 +55,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		{
 			_props = JsonConvert.DeserializeObject<ZoomRoomPropertiesConfig>(config.Properties.ToString());
 
-            _receiveQueue = new GenericQueue(Key + "-rxQueue", Thread.eThreadPriority.MediumPriority, 512);
+			_receiveQueue = new GenericQueue(Key + "-rxQueue", Thread.eThreadPriority.MediumPriority, 512);
 
 			Communication = comm;
 
@@ -94,9 +95,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				eRoutingSignalType.Audio | eRoutingSignalType.Video,
 				eRoutingPortConnectionType.Hdmi, null, this);
 
-            Output2 = new RoutingOutputPort(RoutingPortNames.AnyVideoOut,
-                eRoutingSignalType.Video,
-                eRoutingPortConnectionType.DisplayPort, null, this);
+			Output2 = new RoutingOutputPort(RoutingPortNames.AnyVideoOut,
+				eRoutingSignalType.Video,
+				eRoutingPortConnectionType.DisplayPort, null, this);
 
 			SelfviewIsOnFeedback = new BoolFeedback(SelfViewIsOnFeedbackFunc);
 
@@ -114,7 +115,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			// TODO: #714 [ ] SelfviewPipSizeFeedback
 			SelfviewPipSizeFeedback = new StringFeedback(SelfviewPipSizeFeedbackFunc);
-			
+
 			SetUpFeedbackActions();
 
 			Cameras = new List<CameraBase>();
@@ -157,18 +158,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		{
 			get
 			{
-				return () => 
-                {
-                    var scaledVol = CrestronEnvironment.ScaleWithLimits(Configuration.Audio.Output.Volume, 100, 0, 65535, 0);
+				return () =>
+				{
+					var scaledVol = CrestronEnvironment.ScaleWithLimits(Configuration.Audio.Output.Volume, 100, 0, 65535, 0);
 
-                    if (Configuration.Audio.Output.Volume != 0)
-                    {
-                        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
-                    }
+					if (Configuration.Audio.Output.Volume != 0)
+					{
+						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
+					}
 
-                    return scaledVol;
-                };
+					return scaledVol;
+				};
 			}
 		}
 
@@ -266,7 +267,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public RoutingInputPort CodecOsdIn { get; private set; }
 		public RoutingOutputPort Output1 { get; private set; }
-        public RoutingOutputPort Output2 { get; private set; }
+		public RoutingOutputPort Output2 { get; private set; }
 
 		#region ICommunicationMonitor Members
 
@@ -329,6 +330,11 @@ 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");
@@ -361,6 +367,16 @@ 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; }
@@ -374,9 +390,8 @@ 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)
@@ -388,18 +403,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			DirectoryBrowseHistoryStack.Push(_currentDirectoryResult);
 
-			_currentDirectoryResult = directoryResults;
+			CurrentDirectoryResult = directoryResults;
 
-			OnDirectoryResultReturned(directoryResults);
 		}
 
 		public void SetCurrentDirectoryToRoot()
 		{
 			DirectoryBrowseHistoryStack.Clear();
 
-			_currentDirectoryResult = DirectoryRoot;
-
-			OnDirectoryResultReturned(DirectoryRoot);
+			CurrentDirectoryResult = DirectoryRoot;
 		}
 
 		public void GetDirectoryParentFolderContents()
@@ -411,9 +423,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			var currentDirectory = DirectoryBrowseHistoryStack.Pop();
 
-			_currentDirectoryResult = currentDirectory;
-
-			OnDirectoryResultReturned(currentDirectory);
+			CurrentDirectoryResult = currentDirectory;
 		}
 
 		public BoolFeedback CurrentDirectoryResultIsNotDirectoryRoot { get; private set; }
@@ -543,44 +553,44 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							break;
 						}
 					case "Size":
-					{
-						// TODO: #714 [ ] SetupFeedbackActions >> Size
-						ComputeSelfviewPipSizeStatus();
+						{
+							// TODO: #714 [ ] SetupFeedbackActions >> Size
+							ComputeSelfviewPipSizeStatus();
 
-						SelfviewPipSizeFeedback.FireUpdate();
+							SelfviewPipSizeFeedback.FireUpdate();
 
-						break;
-					}
+							break;
+						}
 
 				}
 			};
 
-            // This is to deal with incorrect object structure coming back from the Zoom Room on v 5.6.3
-            Configuration.Client.Call.Layout.PropertyChanged += (o,a) =>
-            {
-                switch (a.PropertyName)
-                {
-                    case "Position":
-                        {
-                            ComputeSelfviewPipPositionStatus();
+			// This is to deal with incorrect object structure coming back from the Zoom Room on v 5.6.3
+			Configuration.Client.Call.Layout.PropertyChanged += (o, a) =>
+			{
+				switch (a.PropertyName)
+				{
+					case "Position":
+						{
+							ComputeSelfviewPipPositionStatus();
 
-                            SelfviewPipPositionFeedback.FireUpdate();
+							SelfviewPipPositionFeedback.FireUpdate();
 
-                            break;
-                        }
-                    case "ShareThumb":
-                        {
-                            ContentSwappedWithThumbnailFeedback.FireUpdate();
-                            break;
-                        }
-                    case "Style":
-                        {
-                            LocalLayoutFeedback.FireUpdate();
-                            break;
-                        }
+							break;
+						}
+					case "ShareThumb":
+						{
+							ContentSwappedWithThumbnailFeedback.FireUpdate();
+							break;
+						}
+					case "Style":
+						{
+							LocalLayoutFeedback.FireUpdate();
+							break;
+						}
 
-                }
-            };
+				}
+			};
 
 			Status.Call.Sharing.PropertyChanged += (o, a) =>
 			{
@@ -680,16 +690,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		private void SetUpDirectory()
 		{
-			DirectoryRoot = new CodecDirectory();
+			DirectoryRoot = new CodecDirectory() { ResultsFolderId = "root" };
 
-            _currentDirectoryResult = DirectoryRoot;
+			CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => CurrentDirectoryResult.ResultsFolderId != "root");
+
+			CurrentDirectoryResult = DirectoryRoot;
 
 			DirectoryBrowseHistory = new List<CodecDirectory>();
 			DirectoryBrowseHistoryStack = new Stack<CodecDirectory>();
 
-			CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => _currentDirectoryResult != DirectoryRoot);
-
-			CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
 		}
 
 		private void SetUpRouting()
@@ -700,7 +709,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			// Set up output ports
 			OutputPorts.Add(Output1);
-            OutputPorts.Add(Output2);
+			OutputPorts.Add(Output2);
 		}
 
 		/// <summary>
@@ -755,12 +764,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			if (s == "1")
 			{
 				CommDebuggingIsOn = true;
-				Debug.Console(0, this, "Comm Debug Enabled.");
+				Debug.Console(1, this, "Comm Debug Enabled.");
 			}
 			else
 			{
 				CommDebuggingIsOn = false;
-				Debug.Console(0, this, "Comm Debug Disabled.");
+				Debug.Console(1, this, "Comm Debug Disabled.");
 			}
 		}
 
@@ -868,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(0, this, Debug.ErrorLogLevel.Error,
+				Debug.Console(1, this, Debug.ErrorLogLevel.Error,
 					"Zoom Room Controller or App connected. Essentials will NOT control the Zoom Room until it is disconnected.");
 
 				return;
@@ -962,8 +971,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								Thread.Sleep(100);
 								SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/callout_country_list");
 								Thread.Sleep(100);
-                                SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/toll_free_callinLlist");
-                                Thread.Sleep(100);
+								SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/toll_free_callinLlist");
+								Thread.Sleep(100);
 
 								if (!_props.DisablePhonebookAutoDownload)
 								{
@@ -1054,24 +1063,30 @@ 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(false);
+											PhonebookSyncState.SetPhonebookHasFolders(true);
 											PhonebookSyncState.SetNumberOfContacts(Status.Phonebook.Contacts.Count);
 										}
 
-										var directoryResults =
-											zStatus.Phonebook.ConvertZoomContactsToGeneric(Status.Phonebook.Contacts);
+										if (directoryResults.ResultsFolderId != "root")
+										{
+											directoryResults.ResultsFolderId = "root";
+										}
 
 										DirectoryRoot = directoryResults;
 
-										_currentDirectoryResult = DirectoryRoot;
-
-										OnDirectoryResultReturned(directoryResults);
+										CurrentDirectoryResult = directoryResults;
 
 										break;
 									}
@@ -1096,6 +1111,10 @@ 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":
@@ -1121,9 +1140,30 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 																}
 																break;
 															case "ZRCUserChangedEventJoinedMeeting":
-																Status.Call.Participants.Add(participant);
-																break;
+																{
+																	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;
@@ -1134,7 +1174,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 												Status.Call.Participants);
 
 										Participants.CurrentParticipants = participants;
-
 										PrintCurrentCallParticipants();
 
 										break;
@@ -1227,7 +1266,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 											{
 												Direction = eCodecCallDirection.Incoming,
 												Status = eCodecCallStatus.Ringing,
-												Type = eCodecCallType.Unknown,
+												Type = eCodecCallType.Video,
 												Name = incomingCall.callerName,
 												Id = incomingCall.callerJID
 											};
@@ -1268,6 +1307,9 @@ 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)
@@ -1276,15 +1318,16 @@ 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;
 									}
@@ -1335,24 +1378,24 @@ 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;
+										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));
+										// 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));
 
-                                            // 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.IsPinnedFb = false;
-                                                alreadyPinnedParticipant.ScreenIndexIsPinnedToFb = -1;
-                                            }
-                                        }
+											// 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.IsPinnedFb = false;
+												alreadyPinnedParticipant.ScreenIndexIsPinnedToFb = -1;
+											}
+										}
 
 										var participant = Participants.CurrentParticipants.FirstOrDefault(p => p.UserId.Equals(status.PinnedUserId));
 
@@ -1372,7 +1415,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 											}
 											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;
 											}
@@ -1417,6 +1460,12 @@ 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;
@@ -1512,18 +1561,26 @@ 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, "Name: {0} Audio: {1} IsHost: {2}", participant.Name,
-					participant.AudioMuteFb, participant.IsHost);
+				Debug.Console(1, this, "UserId: {3} Name: {0} Audio: {1} IsHost: {2}",
+					participant.Name, participant.AudioMuteFb, participant.IsHost, participant.UserId);
 			}
 			Debug.Console(1, this, "************************************************************************");
 		}
@@ -1543,19 +1600,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		private void UpdateCallStatus()
 		{
 			Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
-				Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
+				Status.Call != null ? Status.Call.Status.ToString() : "no call");
 
 			if (Status.Call != null)
 			{
 				var callStatus = Status.Call.Status;
 
-				// If not currently in a meeting, intialize the call object
+				// If not crrently in a meeting, intialize the call object
 				if (callStatus != zStatus.eCallStatus.IN_MEETING && callStatus != zStatus.eCallStatus.CONNECTING_MEETING)
 				{
-					Debug.Console(1, this, "Creating new Status.Call object");
+					Debug.Console(1, this, "[UpdateCallStatus] Creating new Status.Call object");
 					Status.Call = new zStatus.Call { Status = callStatus };
 
-                    OnCallStatusChange( new CodecActiveCallItem() { Status = eCodecCallStatus.Disconnected });
+					OnCallStatusChange(new CodecActiveCallItem() { Status = eCodecCallStatus.Disconnected });
 
 					SetUpCallFeedbackActions();
 				}
@@ -1577,22 +1634,30 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								break;
 						}
 
-						var newCall = new CodecActiveCallItem 
-                        {
-                            Name = Status.Call.Info.meeting_list_item.meetingName,
-                            Id = Status.Call.Info.meeting_id,
-                            Status = newStatus 
-                        };
+						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,
+							};
 
-						ActiveCalls.Add(newCall);
+							ActiveCalls.Add(newCall);
 
-						Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
-							Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
+							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);
 
-						OnCallStatusChange(newCall);
+							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
 				{
@@ -1608,14 +1673,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							break;
 					}
 
-					Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
-						Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
+					Debug.Console(1, this, "[UpdateCallStatus] ELSE ActiveCalls.Count == {1} - Current Call Status: {0}",
+						Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
 
 					OnCallStatusChange(existingCall);
 				}
 			}
 
-			Debug.Console(1, this, "*************************** Active Calls ********************************");
+			Debug.Console(1, this, "[UpdateCallStatus] Active Calls ------------------------------");
 
 			// Clean up any disconnected calls left in the list
 			for (int i = 0; i < ActiveCalls.Count; i++)
@@ -1623,26 +1688,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				var call = ActiveCalls[i];
 
 				Debug.Console(1, this,
-					@"Name: {0}
-                    ID: {1}
+					@"ID: {1}
+					Number: {5}
+					Name: {0}                    
                     IsActive: {2}
                     Status: {3}
-                    Direction: {4}", call.Name, call.Id, call.IsActiveCall, call.Status, call.Direction);
+                    Direction: {4}
+					IsActiveCall: {6}", call.Name, call.Id, call.IsActiveCall, call.Status, call.Direction, call.Number, call.IsActiveCall);
 
 				if (!call.IsActiveCall)
 				{
-					Debug.Console(1, this, "***** Removing Inactive Call: {0} *****", call.Name);
+					Debug.Console(1, this, "[UpdateCallStatus] Removing Inactive call.Id: {1} call.Name: {0}", call.Name, call.Id);
 					ActiveCalls.Remove(call);
 				}
 			}
-			Debug.Console(1, this, "**************************************************************************");
+			Debug.Console(1, this, "[UpdateCallStatus] Active Calls ------------------------------");
 
 			//clear participants list after call cleanup
-			if (ActiveCalls.Count == 0)
-			{
-                var emptyList = new List<Participant>();
-				Participants.CurrentParticipants = emptyList;
-			}
+			var emptyList = new List<Participant>();
+			Participants.CurrentParticipants = emptyList;
+			if (ActiveCalls.Count > 0) GetCurrentCallParticipants();
 		}
 
 		protected override void OnCallStatusChange(CodecActiveCallItem item)
@@ -1650,7 +1715,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.Sharing.State.ToString() : "no call");
+				Status.Call != null ? Status.Call.Status.ToString() : "no call");
 
 			if (_props.AutoDefaultLayouts)
 			{
@@ -1695,7 +1760,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public override void MuteOff()
 		{
-            Debug.Console(2, this, "Unmuting to previous level: {0}", _previousVolumeLevel);
+			Debug.Console(2, this, "Unmuting to previous level: {0}", _previousVolumeLevel);
 			SetVolume((ushort)_previousVolumeLevel);
 		}
 
@@ -1787,7 +1852,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			LinkVideoCodecToApi(this, trilist, joinMap);
 
-			LinkZoomRoomToApi(trilist, joinMap);			
+			LinkZoomRoomToApi(trilist, joinMap);
 		}
 
 		/// <summary>
@@ -1817,7 +1882,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					trilist.SetString(joinMap.LayoutStripIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Strip.ToString());
 					trilist.SetString(joinMap.LayoutShareAllIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.ShareAll.ToString());
 				};
-				
+
 				trilist.SetSigFalseAction(joinMap.SwapContentWithThumbnail.JoinNumber, () => layoutsCodec.SwapContentWithThumbnail());
 
 				layoutsCodec.CanSwapContentWithThumbnailFeedback.LinkInputSig(trilist.BooleanInput[joinMap.CanSwapContentWithThumbnail.JoinNumber]);
@@ -1842,7 +1907,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 						}
 					});
 
-				layoutsCodec.LocalLayoutFeedback.LinkInputSig(trilist.StringInput[joinMap.GetSetCurrentLayout.JoinNumber]);								
+				layoutsCodec.LocalLayoutFeedback.LinkInputSig(trilist.StringInput[joinMap.GetSetCurrentLayout.JoinNumber]);
 			}
 
 			var pinCodec = this as IHasParticipantPinUnpin;
@@ -1863,7 +1928,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				{
 					try
 					{
-						var size = (zConfiguration.eLayoutSize)Enum.Parse(typeof(zConfiguration.eLayoutSize), s, true);					
+						var size = (zConfiguration.eLayoutSize)Enum.Parse(typeof(zConfiguration.eLayoutSize), s, true);
 						var cmd = SelfviewPipSizes.FirstOrDefault(c => c.Command.Equals(size.ToString()));
 						SelfviewPipSizeSet(cmd);
 					}
@@ -1881,7 +1946,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				if (!args.DeviceOnLine) return;
 
 				ComputeAvailableLayouts();
-				layoutsCodec.LocalLayoutFeedback.FireUpdate();								
+				layoutsCodec.LocalLayoutFeedback.FireUpdate();
 				layoutsCodec.CanSwapContentWithThumbnailFeedback.FireUpdate();
 				layoutsCodec.ContentSwappedWithThumbnailFeedback.FireUpdate();
 				layoutsCodec.LayoutViewIsOnFirstPageFeedback.FireUpdate();
@@ -1889,7 +1954,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				pinCodec.NumberOfScreensFeedback.FireUpdate();
 				layoutSizeCodec.SelfviewPipSizeFeedback.FireUpdate();
 			};
-		}		
+		}
 
 		public override void ExecuteSwitch(object selector)
 		{
@@ -1999,17 +2064,42 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		/// <param name="result"></param>
 		private void OnDirectoryResultReturned(CodecDirectory result)
 		{
-			CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
-
-			// This will return the latest results to all UIs.  Multiple indendent UI Directory browsing will require a different methodology
-			var handler = DirectoryResultReturned;
-			if (handler != null)
+			try
 			{
-				handler(this, new DirectoryEventArgs
+				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)
 				{
-					Directory = result,
-					DirectoryIsOnRoot = !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);
+
+				// This will return the latest results to all UIs.  Multiple indendent UI Directory browsing will require a different methodology
+				var handler = DirectoryResultReturned;
+				if (handler != null)
+				{
+					handler(this, new DirectoryEventArgs
+					{
+						Directory = directoryResult,
+						DirectoryIsOnRoot = !CurrentDirectoryResultIsNotDirectoryRoot.BoolValue
+					});
+				}
+			}
+			catch (Exception e)
+			{
+				Debug.Console(2, this, "Error: {0}", e);
 			}
 
 			//PrintDirectory(result);
@@ -2026,15 +2116,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			foreach (var cam in Status.Cameras)
 			{
-                // Known Issue:
-                // Crestron UC engine systems seem to report an item in the cameras list that represnts the USB bridge device. 
-                // If we know the name and it's reliably consistent, we could ignore it here...
+				// Known Issue:
+				// Crestron UC engine systems seem to report an item in the cameras list that represnts the USB bridge device. 
+				// If we know the name and it's reliably consistent, we could ignore it here...
 
-                if (cam.Name.IndexOf("HD-CONV-USB") > -1)
-                {
-                    // Skip this as it's the Crestron USB box, not a real camera
-                    continue;
-                }
+				if (cam.Name.IndexOf("HD-CONV-USB") > -1)
+				{
+					// Skip this as it's the Crestron USB box, not a real camera
+					continue;
+				}
 
 				var camera = new ZoomRoomCamera(cam.id, cam.Name, this);
 
@@ -2402,7 +2492,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				availableLayouts |= zConfiguration.eLayoutStyle.Strip;
 			}
 
-			Debug.Console(1, this, "availablelayouts: {0}", availableLayouts);			
+			Debug.Console(1, this, "availablelayouts: {0}", availableLayouts);
 
 			var handler = AvailableLayoutsChanged;
 			if (handler != null)
@@ -2449,68 +2539,68 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		#region IHasCodecLayouts Members
 
-        private Func<string> LocalLayoutFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                    {
-                        if (Configuration.Call.Layout.Style != zConfiguration.eLayoutStyle.None)
-                            return Configuration.Call.Layout.Style.ToString();
-                        else
-                            return Configuration.Client.Call.Layout.Style.ToString();
-                    };
-            }
-        }
+		private Func<string> LocalLayoutFeedbackFunc
+		{
+			get
+			{
+				return () =>
+					{
+						if (Configuration.Call.Layout.Style != zConfiguration.eLayoutStyle.None)
+							return Configuration.Call.Layout.Style.ToString();
+						else
+							return Configuration.Client.Call.Layout.Style.ToString();
+					};
+			}
+		}
 
 		public StringFeedback LocalLayoutFeedback { get; private set; }
 
 		public void LocalLayoutToggle()
 		{
-            var currentLayout = LocalLayoutFeedback.StringValue;
+			var currentLayout = LocalLayoutFeedback.StringValue;
 
-            var eCurrentLayout = (int)Enum.Parse(typeof(zConfiguration.eLayoutStyle), currentLayout, true);
+			var eCurrentLayout = (int)Enum.Parse(typeof(zConfiguration.eLayoutStyle), currentLayout, true);
 
-            var nextLayout = GetNextLayout(eCurrentLayout);
+			var nextLayout = GetNextLayout(eCurrentLayout);
 
-            if (nextLayout != zConfiguration.eLayoutStyle.None)
-            {
-                SetLayout(nextLayout);
-            }
+			if (nextLayout != zConfiguration.eLayoutStyle.None)
+			{
+				SetLayout(nextLayout);
+			}
 		}
 
-        /// <summary>
-        /// Tries to get the next available layout
-        /// </summary>
-        /// <param name="currentLayout"></param>
-        /// <returns></returns>
-        private zConfiguration.eLayoutStyle GetNextLayout(int currentLayout)
-        {
-            if (AvailableLayouts == zConfiguration.eLayoutStyle.None)
-            {
-                return zConfiguration.eLayoutStyle.None;
-            }
+		/// <summary>
+		/// Tries to get the next available layout
+		/// </summary>
+		/// <param name="currentLayout"></param>
+		/// <returns></returns>
+		private zConfiguration.eLayoutStyle GetNextLayout(int currentLayout)
+		{
+			if (AvailableLayouts == zConfiguration.eLayoutStyle.None)
+			{
+				return zConfiguration.eLayoutStyle.None;
+			}
 
-            zConfiguration.eLayoutStyle nextLayout;
+			zConfiguration.eLayoutStyle nextLayout;
 
-            if (((zConfiguration.eLayoutStyle)currentLayout & zConfiguration.eLayoutStyle.ShareAll) == zConfiguration.eLayoutStyle.ShareAll)
-            {
-                nextLayout = zConfiguration.eLayoutStyle.Gallery;
-            }
-            else
-            {
-                nextLayout = (zConfiguration.eLayoutStyle)(currentLayout << 1);
-            }
+			if (((zConfiguration.eLayoutStyle)currentLayout & zConfiguration.eLayoutStyle.ShareAll) == zConfiguration.eLayoutStyle.ShareAll)
+			{
+				nextLayout = zConfiguration.eLayoutStyle.Gallery;
+			}
+			else
+			{
+				nextLayout = (zConfiguration.eLayoutStyle)(currentLayout << 1);
+			}
 
-            if ((AvailableLayouts & nextLayout) == nextLayout)
-            {
-                return nextLayout;
-            }
-            else
-            {
-                return GetNextLayout((int)nextLayout);
-            }
-        }
+			if ((AvailableLayouts & nextLayout) == nextLayout)
+			{
+				return nextLayout;
+			}
+			else
+			{
+				return GetNextLayout((int)nextLayout);
+			}
+		}
 
 		public void LocalLayoutToggleSingleProminent()
 		{
@@ -2520,7 +2610,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		public void MinMaxLayoutToggle()
 		{
 			throw new NotImplementedException();
-		}		
+		}
 
 		#endregion