Fixed possible deadlock #siskinim-317

tigase · Nov 25, 2021 · cbb6221 · cbb6221
1 parent 9a9b523
commit cbb6221
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/SiskinIM/util/ContactManager.swift b/SiskinIM/util/ContactManager.swift
@@ -120,23 +120,25 @@ public class ContactManager {
     }
 
     public func update(name: String?, for key: Contact.Key) {
-        guard let contact = existingContact(for: key) else {
-            return;
-        }
-
-        DispatchQueue.main.async {
-            contact.displayName = name ?? key.jid.stringValue;
+        dispatcher.async {
+            guard let contact = self.items[key]?.contact else {
+                return;
+            }
+            DispatchQueue.main.async {
+                contact.displayName = name ?? key.jid.stringValue;
+            }
         }
     }
 
     public func update(presence: Presence?, for key: Contact.Key) {
-        guard let contact = existingContact(for: key) else {
-            return;
-        }
-
-        DispatchQueue.main.async {
-            contact.status = presence?.show;
-            contact.description = presence?.status;
+        dispatcher.async {
+            guard let contact = self.items[key]?.contact else {
+                return;
+            }
+            DispatchQueue.main.async {
+                contact.status = presence?.show;
+                contact.description = presence?.status;
+            }
         }
     }