Merge remote-tracking branch 'origin/hotfix/fix-thread-aborts-again' …

…into feature/presenter-pin-prompt # Conflicts: # src/WebexPinRequestHandler.cs
PepperDash · May 23, 2024 · a7b7276 · a7b7276
2 parents 9080c4c + a994597
commit a7b7276
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/src/CiscoCodecPhonebookDataClasses.cs b/src/CiscoCodecPhonebookDataClasses.cs
@@ -223,7 +223,7 @@ public static List<DirectoryItem> GetRootContactsFromSearchResult(PhonebookSearc
 
                     foreach (Contact c in result.Contact)
                     {
-                        var contact = new DirectoryContact();
+                        var contact = new DirectoryContact {ParentFolderId = "root"};
 
                         if (string.IsNullOrEmpty(c.FolderId.Value))
                         {
@@ -277,6 +277,7 @@ public static List<DirectoryItem> GetRootContactsFromSearchResult(PhonebookSearc
 
                                 contact.ContactMethods.Add(tempContactMethod);
                             }
+
                             rootContacts.Add(contact);
                         }
                     }
@@ -347,6 +348,10 @@ public static CodecDirectory ConvertCiscoPhonebookToGeneric(PhonebookSearchResul
                         {
                             contact.FolderId = c.FolderId.Value;
                         }
+                        else
+                        {
+                            contact.FolderId = "root";
+                        }
 
                         foreach (ContactMethod m in c.ContactMethod)
                         {

diff --git a/src/CiscoRoomOsCodec.cs b/src/CiscoRoomOsCodec.cs
@@ -2908,10 +2908,10 @@ public eCodecCallStatus ConvertToStatusEnum(string s)
 
         public bool MergeCallData(CodecActiveCallItem existingCallData, CodecActiveCallItem newCallData)
         {
-            Debug.Console(0, this, "Merging Call Data");
-            Debug.Console(0, this, "Existing : ");
+            Debug.Console(2, this, "Merging Call Data");
+            Debug.Console(2, this, "Existing : ");
             PrintCallItem(existingCallData);
-            Debug.Console(0, this, "New");
+            Debug.Console(2, this, "New");
             PrintCallItem(newCallData);
             bool valueChanged = false;
 
@@ -2921,8 +2921,8 @@ public bool MergeCallData(CodecActiveCallItem existingCallData, CodecActiveCallI
                 valueChanged = true;
             }
 
-            Debug.Console(1, "New Duration : {0}", newCallData.Duration.TotalSeconds);
-            Debug.Console(1, "Old Duration : {0}", existingCallData.Duration.TotalSeconds);
+            Debug.Console(2, "New Duration : {0}", newCallData.Duration.TotalSeconds);
+            Debug.Console(2, "Old Duration : {0}", existingCallData.Duration.TotalSeconds);
             if (existingCallData.Duration != newCallData.Duration &&
                 newCallData.Duration.Seconds != Int32.MaxValue)
             {
@@ -3389,7 +3389,8 @@ private void ParseStatusObject(JToken statusToken)
             if (!_syncState.InitialConfigurationMessageWasReceived)
             {
                 Debug.Console(0, this, "Sending Configuration");
-                SendText("xConfiguration");
+                SendText("xConfiguration conference");
+                SendText("xConfiguration h323");
             }
             if (_syncState.FeedbackWasRegistered) return;
             Debug.Console(0, this, "Sending Feedback");
@@ -3491,6 +3492,7 @@ private void ParseConfigurationObject(JToken configurationToken)
                 } 
                 if (_syncState.InitialConfigurationMessageWasReceived) return;
                 Debug.Console(2, this, "InitialConfig Received");
+
                 _syncState.InitialConfigurationMessageReceived();
                 if (!_syncState.InitialSoftwareVersionMessageWasReceived)
                 {
@@ -3593,8 +3595,7 @@ private void ParsePhonebookNumberOfContacts(
             }
             catch (Exception ex)
             {
-
-                Debug.Console(0, this, "Exception in ParsePhonebookNumberOfContacts : {0}", ex.Message);
+                Debug.Console(0, this, "Exception in ParsePhonebookNumberOfContacts : {0}", ex);
                 if (ex.InnerException == null) return;
                 Debug.Console(0, this, "Inner Exception in ParsePhonebookNumberOfContacts : {0}", ex.InnerException.Message);
             }
@@ -3784,11 +3785,14 @@ private static string ParseResultId(JObject obj)
         {
             try
             {
-                return obj["ResultId"].ToString();
+                JToken result;
+                return obj.TryGetValue("ResultId", out result)
+                    ? result.Value<string>()
+                    : string.Empty;
             }
             catch (Exception ex)
             {
-                return Guid.Empty.ToString();
+                return string.Empty;
             }
         }
 
@@ -4455,8 +4459,7 @@ var jPreset in
 
                 if (ex is JsonReaderException)
                 {
-                    Debug.Console(1, this, "Received malformed response from codec.");
-
+                    Debug.Console(1, this, "Received malformed response from codec:{0}", response);
                     //Communication.Disconnect();
 
                     //Initialize();