Properly update UI on received group sync messages

fixes #158

Author: Trolldemorted

Signal-Windows.Lib/IncomingMessages.cs

@@ -221,8 +221,8 @@ private async Task HandleMessage(SignalServiceEnvelope envelope)
                             };
                             groupsList.Add((group, g.Members));
                         }
-                        List<SignalConversation> newConversations = await SignalDBContext.InsertOrUpdateGroups(groupsList);
-                        await SignalLibHandle.Instance.DispatchAddOrUpdateConversations(newConversations);
+                        List<SignalConversation> dbGroups = await SignalDBContext.InsertOrUpdateGroups(groupsList);
+                        await SignalLibHandle.Instance.DispatchAddOrUpdateConversations(dbGroups);
                     }
                 }
                 else if (content.SynchronizeMessage.Contacts != null && content.SynchronizeMessage.Contacts.Complete) //TODO incomplete updates
@@ -257,8 +257,8 @@ private async Task HandleMessage(SignalServiceEnvelope envelope)
                             };
                             contactsList.Add(contact);
                         }
-                        var newConversations = SignalDBContext.InsertOrUpdateContacts(contactsList);
-                        await SignalLibHandle.Instance.DispatchAddOrUpdateConversations(newConversations);
+                        var dbContacts = SignalDBContext.InsertOrUpdateContacts(contactsList);
+                        await SignalLibHandle.Instance.DispatchAddOrUpdateConversations(dbContacts);
                     }
                 }
             }

Signal-Windows.Lib/SignalLibHandle.cs

@@ -545,7 +545,7 @@ await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             }
         }
 
-        internal async Task DispatchAddOrUpdateConversations(List<SignalConversation> newConversations)
+        internal async Task DispatchAddOrUpdateConversations(IList<SignalConversation> newConversations)
         {
             List<Task> operations = new List<Task>();
             foreach (var dispatcher in Frames.Keys)

Signal-Windows.Lib/Storage/DB.cs

@@ -1124,15 +1124,16 @@ internal static async Task<List<SignalConversation>> InsertOrUpdateGroups(IList<
                                 dbGroup = group;
                                 ctx.Groups.Add(dbGroup);
                             }
+                            refreshedGroups.Add(dbGroup);
                             foreach (var member in members)
                             {
-                                (var contact, var notify) = GetOrCreateContact(ctx, member, 0);
+                                (var contact, var createdNew) = GetOrCreateContact(ctx, member, 0);
                                 dbGroup.GroupMemberships.Add(new GroupMembership()
                                 {
                                     Contact = contact,
                                     Group = dbGroup
                                 });
-                                if (notify)
+                                if (createdNew)
                                 {
                                     newContacts.Add(contact);
                                 }
@@ -1153,7 +1154,7 @@ internal static async Task<List<SignalConversation>> InsertOrUpdateGroups(IList<
             return refreshedGroups;
         }
 
-        internal static List<SignalConversation> InsertOrUpdateContacts(IList<SignalContact> contacts)
+        internal static IList<SignalConversation> InsertOrUpdateContacts(IList<SignalContact> contacts)
         {
             List<SignalConversation> refreshedContacts = new List<SignalConversation>();
             lock (DBLock)
@@ -1351,24 +1352,25 @@ public static List<SignalContact> GetAllContactsLocked()
             }
         }
 
-        public static async Task<SignalContact> GetOrCreateContactLocked(string username, long timestamp, bool notify = true)
+        public static async Task<SignalContact> GetOrCreateContactLocked(string username, long timestamp)
         {
             SignalContact contact;
+            bool createdNew;
             lock (DBLock)
             {
                 using (var ctx = new SignalDBContext())
                 {
-                    (contact, notify) = GetOrCreateContact(ctx, username, timestamp, notify);
+                    (contact, createdNew) = GetOrCreateContact(ctx, username, timestamp);
                 }
             }
-            if (notify)
+            if (createdNew)
             {
                 await SignalLibHandle.Instance.DispatchAddOrUpdateConversation(contact, null);
             }
             return contact;
         }
 
-        private static (SignalContact contact, bool notify) GetOrCreateContact(SignalDBContext ctx, string username, long timestamp, bool notify = true)
+        private static (SignalContact contact, bool createdNew) GetOrCreateContact(SignalDBContext ctx, string username, long timestamp)
         {
             bool createdNew = false;
             SignalContact contact = contact = ctx.Contacts
@@ -1382,13 +1384,13 @@ private static (SignalContact contact, bool notify) GetOrCreateContact(SignalDBC
                     ThreadDisplayName = username,
                     CanReceive = true,
                     LastActiveTimestamp = timestamp,
-                    Color = null //Utils.CalculateDefaultColor(username)
+                    Color = null
                 };
                 ctx.Contacts.Add(contact);
                 ctx.SaveChanges();
                 createdNew = true;
             }
-            return (contact, createdNew && notify);
+            return (contact, createdNew);
         }
 
         public static void InsertOrUpdateConversationLocked(SignalConversation conversation)