Updated UpdateCallStatus method to fix call status references previously looking at Status.Call.Sharing.State. Added else statement to 'if(ActiveCalls.Count == 0)' used to cleanup after calls that refreshs the participant list. Added GetCurrentCallParticipant method used to poll the participant list.

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/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;
@@ -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,19 +403,16 @@ 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,10 +423,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			var currentDirectory = DirectoryBrowseHistoryStack.Pop();
 
-			_currentDirectoryResult = currentDirectory;
-
-			OnDirectoryResultReturned(currentDirectory);
-		}
+            CurrentDirectoryResult = currentDirectory;
+        }
 
 		public BoolFeedback CurrentDirectoryResultIsNotDirectoryRoot { get; private set; }
 
@@ -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()
@@ -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;
@@ -958,7 +967,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								SendText("echo off");
 								Thread.Sleep(100);
 								// set feedback exclusions
-								SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/callin_country_list");
+								SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/callin_country_list");								
 								Thread.Sleep(100);
 								SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/callout_country_list");
 								Thread.Sleep(100);
@@ -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;
+                                        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,36 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 																}
 																break;
 															case "ZRCUserChangedEventJoinedMeeting":
-																Status.Call.Participants.Add(participant);
+															{
+																var existingParticipant =
+																	Status.Call.Participants.FirstOrDefault(p => p.UserId.Equals(participant.UserId));
+
+																// found matching 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);
+																	
+																	//var emptyList = new List<Participant>();
+																	//Participants.CurrentParticipants = emptyList;
+																	
+																	//GetCurrentCallParticipants();			
+																}
+
 																break;
+															}
 														}
+														
+														Debug.Console(1, this, "[DeserializeResponse] zCommands.listparticipantresult - participant.event: {0} ***********************************", participant.Event);
 													}
 												}
 												break;
@@ -1134,7 +1180,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 												Status.Call.Participants);
 
 										Participants.CurrentParticipants = participants;
-
 										PrintCurrentCallParticipants();
 
 										break;
@@ -1227,7 +1272,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,23 +1313,31 @@ 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)
-											{
+											{												
 												var activeCall = ActiveCalls.FirstOrDefault(c => c.IsActiveCall);
-
+												
 												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;
+											//Participants.OnParticipantsChanged();
 										}
 
+										Debug.Console(1, this, "[DeserializeResponse] zEvent.calldisconnect ********************************************");
+
 										UpdateCallStatus();
 										break;
 									}
@@ -1417,6 +1470,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;
@@ -1522,12 +1581,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			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, "************************************************************************");
 		}
 
+		public void GetCurrentCallParticipants()
+		{
+			SendText("zCommand Call ListParticipants");
+		}
+
 		/// <summary>
 		/// Retrieves bookings list
 		/// </summary>
@@ -1543,16 +1607,18 @@ 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");
+
+			//var emptyList = new List<Participant>();
 
 			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 });
@@ -1569,7 +1635,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 						switch (callStatus)
 						{
-							case zStatus.eCallStatus.CONNECTING_MEETING:
+							case zStatus.eCallStatus.CONNECTING_MEETING:								
 								newStatus = eCodecCallStatus.Connecting;
 								break;
 							case zStatus.eCallStatus.IN_MEETING:
@@ -1577,26 +1643,38 @@ 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);
+							//Participants.CurrentParticipants = emptyList;
 
-						Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
-							Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
+							ActiveCalls.Add(newCall);
 
-						OnCallStatusChange(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);
+
+							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);
+
+							//Participants.CurrentParticipants = emptyList;
+						}
 					}
-
-
 				}
 				else
 				{
-					var existingCall = ActiveCalls.FirstOrDefault(c => !c.Status.Equals(eCodecCallStatus.Ringing));
+					var existingCall = ActiveCalls.FirstOrDefault(c => !c.Status.Equals(eCodecCallStatus.Ringing));					
 
 					switch (callStatus)
 					{
@@ -1604,18 +1682,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							existingCall.Status = eCodecCallStatus.Connected;
 							break;
 						case zStatus.eCallStatus.NOT_IN_MEETING:
+							//Participants.CurrentParticipants = emptyList;
 							existingCall.Status = eCodecCallStatus.Disconnected;
-							break;
+							break;						
+						//default:
+						//    Participants.CurrentParticipants = emptyList;
+						//    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 +1705,34 @@ 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>();
+				var emptyList = new List<Participant>();
 				Participants.CurrentParticipants = emptyList;
 			}
+			else
+			{
+				var emptyList = new List<Participant>();
+				Participants.CurrentParticipants = emptyList;
+				GetCurrentCallParticipants();
+			}
 		}
 
 		protected override void OnCallStatusChange(CodecActiveCallItem item)
@@ -1650,7 +1740,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)
 			{
@@ -1999,18 +2089,43 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		/// <param name="result"></param>
 		private void OnDirectoryResultReturned(CodecDirectory result)
 		{
-			CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
+            try
+            {
+                Debug.Console(2, this, "OnDirectoryResultReturned");
 
-			// 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 = result,
-					DirectoryIsOnRoot = !CurrentDirectoryResultIsNotDirectoryRoot.BoolValue
-				});
-			}
+                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);
+
+                // 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);
 		}