remove unused functions, properly handle the unreadcount

Author: Trolldemorted

Signal-Windows/Storage/DB.cs

@@ -765,6 +765,15 @@ public static void SaveMessageLocked(SignalMessage message)
                         contact.LastActiveTimestamp = timestamp;
                         contact.LastMessage = message;
                         contact.MessagesCount += 1;
+                        if (message.Author == null)
+                        {
+                            contact.UnreadCount = 0;
+                            contact.LastSeenMessageIndex = contact.MessagesCount;
+                        }
+                        else
+                        {
+                            contact.UnreadCount += 1;
+                        }
                     }
                     else
                     {
@@ -775,6 +784,15 @@ public static void SaveMessageLocked(SignalMessage message)
                         group.LastActiveTimestamp = timestamp;
                         group.LastMessage = message;
                         group.MessagesCount += 1;
+                        if (message.Author == null)
+                        {
+                            group.UnreadCount = 0;
+                            group.LastSeenMessageIndex = group.MessagesCount;
+                        }
+                        else
+                        {
+                            group.UnreadCount += 1;
+                        }
                     }
                     ctx.Messages.Add(message);
                     ctx.SaveChanges();
@@ -934,68 +952,6 @@ public static void UpdateExpiresInLocked(SignalConversation thread, uint exp)
             }
         }
 
-        public static void UpdateConversationLocked(string threadId, uint unread, long? lastSeenMessageIndex)
-        {
-            lock (DBLock)
-            {
-                using (var ctx = new SignalDBContext())
-                {
-                    var contact = ctx.Contacts
-                        .Where(c => c.ThreadId == threadId)
-                        .SingleOrDefault();
-                    if (contact == null)
-                    {
-                        var group = ctx.Groups
-                            .Where(g => g.ThreadId == threadId)
-                            .Single();
-                        group.UnreadCount = unread;
-                        if (lastSeenMessageIndex != null)
-                        {
-                            group.LastSeenMessageIndex = lastSeenMessageIndex.Value;
-                        }
-                    }
-                    else
-                    {
-                        contact.UnreadCount = unread;
-                        if (lastSeenMessageIndex != null)
-                        {
-                            contact.LastSeenMessageIndex = lastSeenMessageIndex.Value;
-                        }
-                    }
-                    ctx.SaveChanges();
-                }
-            }
-        }
-
-        public static SignalConversation ClearUnreadLocked(string threadId, long lastReadIndex)
-        {
-            lock (DBLock)
-            {
-                SignalConversation conversation;
-                using (var ctx = new SignalDBContext())
-                {
-                    conversation = ctx.Contacts
-                        .Where(c => c.ThreadId == threadId)
-                        .SingleOrDefault();
-                    if (conversation == null)
-                    {
-                        conversation = ctx.Groups
-                            .Where(g => g.ThreadId == threadId)
-                            .Single();
-                        conversation.UnreadCount = 0;
-                        conversation.LastSeenMessageIndex = lastReadIndex;
-                    }
-                    else
-                    {
-                        conversation.UnreadCount = 0;
-                        conversation.LastSeenMessageIndex = lastReadIndex;
-                    }
-                    ctx.SaveChanges();
-                }
-                return conversation;
-            }
-        }
-
         #endregion Threads
 
         #region Groups
@@ -1128,7 +1084,6 @@ public static List<SignalGroup> GetAllGroupsLocked()
                         .ThenInclude(gm => gm.Contact)
                         .Include(g => g.LastMessage)
                         .ThenInclude(m => m.Content)
-                        .Include(g => g.LastSeenMessage)
                         .AsNoTracking()
                         .ToList();
                 }
@@ -1149,7 +1104,6 @@ public static List<SignalContact> GetAllContactsLocked()
                         .OrderByDescending(c => c.LastActiveTimestamp)
                         .Include(g => g.LastMessage)
                         .ThenInclude(m => m.Content)
-                        .Include(g => g.LastSeenMessage)
                         .AsNoTracking()
                         .ToList();
                 }

Signal-Windows/ViewModels/MainPageViewModel.cs

@@ -374,6 +374,13 @@ await Task.Run(() =>
                     if (message.Direction == SignalMessageDirection.Synced)
                     {
                         View.Thread.AddToOutgoingMessagesCache(container);
+                        unreadCount = 0;
+                        thread.LastSeenMessageIndex = thread.MessagesCount;
+                    }
+                    else
+                    {
+                        //TODO don't increase unread if we did scroll automatically, and mark the message as seen
+                        unreadCount++;
                     }
                 }
                 else