Withdraw notifications if the frontend knows the conversation is read

Author: Trolldemorted

Signal-Windows/SignalWindowsFrontend.cs

@@ -41,7 +41,9 @@ public void HandleIdentitykeyChange(LinkedList<SignalMessage> messages)
 
         public AppendResult HandleMessage(SignalMessage message, SignalConversation conversation)
         {
-            return Locator.MainPageInstance.HandleMessage(message, conversation);
+            var result = Locator.MainPageInstance.HandleMessage(message, conversation);
+            CheckNotification(conversation);
+            return result;
         }
 
         public void HandleMessageUpdate(SignalMessage updatedMessage)
@@ -78,20 +80,25 @@ public void HandleAttachmentStatusChanged(SignalAttachment sa)
         public void HandleMessageRead(long messageIndex, SignalConversation conversation)
         {
             Locator.MainPageInstance.HandleMessageRead(messageIndex, conversation);
+            CheckNotification(conversation);
+        }
+
+        public void HandleUnreadMessage(SignalMessage message)
+        {
             if (ApplicationView.GetForCurrentView().Id == App.MainViewId)
             {
-                if (conversation.UnreadCount == 0)
-                {
-                    NotificationsUtils.Withdraw(conversation.ThreadId);
-                }
+                NotificationsUtils.Notify(message);
             }
         }
 
-        public void HandleUnreadMessage(SignalMessage message)
+        private void CheckNotification(SignalConversation conversation)
         {
             if (ApplicationView.GetForCurrentView().Id == App.MainViewId)
             {
-                NotificationsUtils.Notify(message);
+                if (conversation.UnreadCount == 0)
+                {
+                    NotificationsUtils.Withdraw(conversation.ThreadId);
+                }
             }
         }
     }