Use correct id when updating group membership

fixes #166

Author: Trolldemorted

Signal-Windows.Lib/IncomingMessages.cs

@@ -489,7 +489,7 @@ private async Task HandleGroupUpdateMessage(SignalServiceEnvelope envelope, Sign
                 {
                     foreach (var member in group.Members)
                     {
-                        SignalDBContext.InsertOrUpdateGroupMembershipLocked(dbgroup.Id, SignalDBContext.GetOrCreateContactLocked(member, 0).Id);
+                        SignalDBContext.InsertOrUpdateGroupMembershipLocked(dbgroup.Id, (await SignalDBContext.GetOrCreateContactLocked(member, 0)).Id);
                     }
                 }
 

Signal-Windows.Lib/Storage/DB.cs

@@ -1109,37 +1109,44 @@ internal static async Task<List<SignalConversation>> InsertOrUpdateGroups(IList<
                 {
                     foreach (var (group, members) in groups)
                     {
-                        var dbGroup = ctx.Groups
+                        try
+                        {
+                            var dbGroup = ctx.Groups
                             .Where(g => g.ThreadId == group.ThreadId)
                             .Include(g => g.GroupMemberships)
                             .Include(g => g.LastMessage)
                             .ThenInclude(m => m.Content)
                             .SingleOrDefault();
-                        if (dbGroup != null)
-                        {
-                            dbGroup.GroupMemberships.Clear();
-                            dbGroup.ThreadDisplayName = group.ThreadDisplayName;
-                            dbGroup.CanReceive = group.CanReceive;
-                            dbGroup.ExpiresInSeconds = group.ExpiresInSeconds;
-                        }
-                        else
-                        {
-                            dbGroup = group;
-                            ctx.Groups.Add(dbGroup);
-                        }
-                        foreach (var member in members)
-                        {
-                            (var contact, var notify) = GetOrCreateContact(ctx, member, 0);
-                            dbGroup.GroupMemberships.Add(new GroupMembership()
+                            if (dbGroup != null)
                             {
-                                Contact = contact,
-                                Group = dbGroup
-                            });
-                            if (notify)
+                                dbGroup.GroupMemberships.Clear();
+                                dbGroup.ThreadDisplayName = group.ThreadDisplayName;
+                                dbGroup.CanReceive = group.CanReceive;
+                                dbGroup.ExpiresInSeconds = group.ExpiresInSeconds;
+                            }
+                            else
+                            {
+                                dbGroup = group;
+                                ctx.Groups.Add(dbGroup);
+                            }
+                            foreach (var member in members)
                             {
-                                newContacts.Add(contact);
+                                (var contact, var notify) = GetOrCreateContact(ctx, member, 0);
+                                dbGroup.GroupMemberships.Add(new GroupMembership()
+                                {
+                                    Contact = contact,
+                                    Group = dbGroup
+                                });
+                                if (notify)
+                                {
+                                    newContacts.Add(contact);
+                                }
                             }
                         }
+                        catch (Exception e)
+                        {
+                            Logger.LogError("InsertOrUpdateGroups failed: {0}\n{1}", e.Message, e.StackTrace);
+                        }
                     }
                     ctx.SaveChanges();
                 }