DB.cs and unread handling cleanup

Our unread handling is now no longer overly complicated, and the database functions have less redundant code

Author: Trolldemorted

Signal-Windows.Lib/IncomingMessages.cs

@@ -276,8 +276,8 @@ private async Task HandleMessage(SignalServiceEnvelope envelope)
 
         private async Task HandleSyncedReadMessage(ReadMessage readMessage)
         {
-            var conv = await SignalDBContext.UpdateMessageRead(readMessage);
-            await SignalLibHandle.Instance.DispatchMessageRead(conv.LastSeenMessageIndex, conv);
+            var updatedConversation = SignalDBContext.UpdateMessageRead(readMessage.Timestamp);
+            await SignalLibHandle.Instance.DispatchMessageRead(updatedConversation);
         }
 
         private async Task HandleExpirationUpdateMessage(SignalServiceEnvelope envelope, SignalServiceContent content, SignalServiceDataMessage message, bool isSync, long timestamp)
@@ -322,7 +322,8 @@ private async Task HandleExpirationUpdateMessage(SignalServiceEnvelope envelope,
                     conversation = await SignalDBContext.GetOrCreateContactLocked(envelope.GetSource(), 0);
                 }
             }
-            SignalDBContext.UpdateExpiresInLocked(conversation, (uint)message.ExpiresInSeconds);
+            conversation.ExpiresInSeconds = (uint) message.ExpiresInSeconds;
+            SignalDBContext.UpdateExpiresInLocked(conversation);
             SignalMessage sm = new SignalMessage()
             {
                 Direction = type,

Signal-Windows.Lib/SignalLibHandle.cs

@@ -29,19 +29,19 @@ namespace Signal_Windows.Lib
 {
     public class AppendResult
     {
-        public long Index { get;  }
-        public AppendResult(long index)
+        public bool WasInstantlyRead { get;  }
+        public AppendResult(bool wasInstantlyRead)
         {
-            Index = index;
+            WasInstantlyRead = wasInstantlyRead;
         }
     }
 
     public interface ISignalFrontend
     {
-        void AddOrUpdateConversation(SignalConversation conversation, SignalMessage updateMessage);
-        AppendResult HandleMessage(SignalMessage message, SignalConversation conversation);
+        void AddOrUpdateConversation(SignalConversation updatedConversation, SignalMessage updateMessage);
+        AppendResult HandleMessage(SignalMessage message, SignalConversation updatedConversation);
         void HandleUnreadMessage(SignalMessage message);
-        void HandleMessageRead(long unreadMarkerIndex, SignalConversation conversation);
+        void HandleMessageRead(SignalConversation updatedConversation);
         void HandleIdentitykeyChange(LinkedList<SignalMessage> messages);
         void HandleMessageUpdate(SignalMessage updatedMessage);
         void ReplaceConversationList(List<SignalConversation> conversations);
@@ -58,7 +58,7 @@ public interface ISignalLibHandle
         void RequestSync();
         Task SendMessage(string messageText, StorageFile attachment, SignalConversation conversation);
         Task SendBlockedMessage();
-        Task SetMessageRead(long index, SignalMessage message, SignalConversation conversation);
+        Task SetMessageRead(SignalMessage message);
         void ResendMessage(SignalMessage message);
         IEnumerable<SignalMessage> GetMessages(SignalConversation thread, int startIndex, int count);
         Task SaveAndDispatchSignalConversation(SignalConversation updatedConversation, SignalMessage updateMessage);
@@ -397,18 +397,18 @@ public void RequestSync()
         /// Marks and dispatches a message as read. Must not be called on a task which holds the handle lock.
         /// </summary>
         /// <param name="message"></param>
-        public async Task SetMessageRead(long index, SignalMessage message, SignalConversation conversation)
+        public async Task SetMessageRead(SignalMessage message)
         {
             Logger.LogTrace("SetMessageRead() locking");
             await SemaphoreSlim.WaitAsync(CancelSource.Token);
             try
             {
                 Logger.LogTrace("SetMessageRead() locked");
-                conversation = SignalDBContext.UpdateMessageRead(index, conversation);
+                var updatedConversation = SignalDBContext.UpdateMessageRead(message.ComposedTimestamp);
                 OutgoingMessages.SendMessage(SignalServiceSyncMessage.ForRead(new List<ReadMessage>() {
                         new ReadMessage(message.Author.ThreadId, message.ComposedTimestamp)
                 }));
-                await DispatchMessageRead(index + 1, conversation);
+                await DispatchMessageRead(updatedConversation);
             }
             catch (Exception e)
             {
@@ -669,10 +669,10 @@ await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
                 foreach (var b in operations)
                 {
                     AppendResult result = await b;
-                    if (result != null)
+                    if (result != null && result.WasInstantlyRead)
                     {
-                        SignalDBContext.UpdateMessageRead(result.Index, conversation);
-                        await DispatchMessageRead(result.Index + 1, conversation);
+                        var updatedConversation = SignalDBContext.UpdateMessageRead(message.ComposedTimestamp);
+                        await DispatchMessageRead(updatedConversation);
                         wasInstantlyRead = true;
                         break;
                     }
@@ -713,7 +713,7 @@ await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             }
         }
 
-        internal async Task DispatchMessageRead(long unreadMarkerIndex, SignalConversation conversation)
+        internal async Task DispatchMessageRead(SignalConversation conversation)
         {
             List<Task> operations = new List<Task>();
             foreach (var dispatcher in Frames.Keys)
@@ -723,7 +723,7 @@ await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
                 {
                     try
                     {
-                        Frames[dispatcher].HandleMessageRead(unreadMarkerIndex, conversation);
+                        Frames[dispatcher].HandleMessageRead(conversation);
                     }
                     catch (Exception e)
                     {