Use more consistent index names, fix index bug

Trolldemorted · Trolldemorted · commit 7814d2eff7e5 · 2018-05-12T09:48:51.000+02:00
diff --git a/Signal-Windows.Lib/IncomingMessages.cs b/Signal-Windows.Lib/IncomingMessages.cs
@@ -157,7 +157,7 @@ private void HandleMessage(SignalServiceEnvelope envelope)
                     {
                         try
                         {
-                            HandleReadMessage(readMessage);
+                            HandleSyncedReadMessage(readMessage);
                         }
                         catch(Exception e)
                         {
@@ -172,14 +172,10 @@ private void HandleMessage(SignalServiceEnvelope envelope)
             }
         }
 
-        private void HandleReadMessage(ReadMessage readMessage)
+        private void HandleSyncedReadMessage(ReadMessage readMessage)
         {
             var conv = SignalDBContext.UpdateMessageRead(readMessage);
-            long readIndex = conv.LastSeenMessageIndex - 1;
-            if (readIndex > 0)
-            {
-                SignalLibHandle.Instance.DispatchMessageRead(conv.LastSeenMessageIndex - 1, conv).Wait();
-            }
+            SignalLibHandle.Instance.DispatchMessageRead(conv.LastSeenMessageIndex, conv).Wait();
         }
 
         private void HandleExpirationUpdateMessage(SignalServiceEnvelope envelope, SignalServiceContent content, SignalServiceDataMessage message, bool isSync, long timestamp)
diff --git a/Signal-Windows.Lib/SignalLibHandle.cs b/Signal-Windows.Lib/SignalLibHandle.cs
@@ -40,7 +40,7 @@ public interface ISignalFrontend
         void AddOrUpdateConversation(SignalConversation conversation, SignalMessage updateMessage);
         AppendResult HandleMessage(SignalMessage message, SignalConversation conversation);
         void HandleUnreadMessage(SignalMessage message);
-        void HandleMessageRead(long messageIndex, SignalConversation conversation);
+        void HandleMessageRead(long unreadMarkerIndex, SignalConversation conversation);
         void HandleIdentitykeyChange(LinkedList<SignalMessage> messages);
         void HandleMessageUpdate(SignalMessage updatedMessage);
         void ReplaceConversationList(List<SignalConversation> conversations);
@@ -345,7 +345,7 @@ public async Task SetMessageRead(long index, SignalMessage message, SignalConver
                 OutgoingMessages.SendMessage(SignalServiceSyncMessage.forRead(new List<ReadMessage>() {
                         new ReadMessage(message.Author.ThreadId, message.ComposedTimestamp)
                 }));
-                await DispatchMessageRead(index, conversation);
+                await DispatchMessageRead(index + 1, conversation);
             }
             finally
             {
@@ -495,7 +495,7 @@ internal void DispatchHandleMessage(SignalMessage message, SignalConversation co
                     if (result != null)
                     {
                         SignalDBContext.UpdateMessageRead(result.Index, conversation);
-                        DispatchMessageRead(result.Index, conversation).Wait();
+                        DispatchMessageRead(result.Index + 1, conversation).Wait();
                         wasInstantlyRead = true;
                         break;
                     }
@@ -520,14 +520,14 @@ internal void DispatchHandleUnreadMessage(SignalMessage message)
             Task.WaitAll(operations.ToArray());
         }
 
-        internal async Task DispatchMessageRead(long messageIndex, SignalConversation conversation)
+        internal async Task DispatchMessageRead(long unreadMarkerIndex, SignalConversation conversation)
         {
             List<Task> operations = new List<Task>();
             foreach (var dispatcher in Frames.Keys)
             {
                 operations.Add(dispatcher.RunTaskAsync(() =>
                 {
-                    Frames[dispatcher].HandleMessageRead(messageIndex, conversation);
+                    Frames[dispatcher].HandleMessageRead(unreadMarkerIndex, conversation);
                 }));
             }
             foreach (var waitHandle in operations)
diff --git a/Signal-Windows.Lib/Storage/DB.cs b/Signal-Windows.Lib/Storage/DB.cs
@@ -1044,6 +1044,7 @@ private static SignalConversation GetSignalConversation(SignalDBContext ctx, str
         internal static SignalConversation UpdateMessageRead(long index, SignalConversation conversation)
         {
             SignalConversation dbConversation = null;
+            long newMarkerIndex = index + 1;
             lock (DBLock)
             {
                 using (var ctx = new SignalDBContext())
@@ -1055,7 +1056,7 @@ internal static SignalConversation UpdateMessageRead(long index, SignalConversat
                             .SingleOrDefault();
                         if (contact != null)
                         {
-                            contact.LastSeenMessageIndex = Math.Max(index, contact.LastSeenMessageIndex);
+                            contact.LastSeenMessageIndex = Math.Max(newMarkerIndex, contact.LastSeenMessageIndex);
                             contact.UnreadCount = (uint)(contact.MessagesCount - contact.LastSeenMessageIndex);
                             dbConversation = contact;
                         }
@@ -1067,7 +1068,7 @@ internal static SignalConversation UpdateMessageRead(long index, SignalConversat
                             .SingleOrDefault();
                         if (group != null)
                         {
-                            group.LastSeenMessageIndex = Math.Max(index, group.LastSeenMessageIndex);
+                            group.LastSeenMessageIndex = Math.Max(newMarkerIndex, group.LastSeenMessageIndex);
                             group.UnreadCount =  (uint)(group.MessagesCount - group.LastSeenMessageIndex);
                             dbConversation = group;
                         }
diff --git a/Signal-Windows/Controls/Conversation.xaml.cs b/Signal-Windows/Controls/Conversation.xaml.cs
@@ -243,7 +243,7 @@ public AppendResult Append(SignalMessageContainer sm)
                 ScrollToBottom();
                 if (ActivationState != CoreWindowActivationState.Deactivated)
                 {
-                    result = new AppendResult(sm.Index + 1);
+                    result = new AppendResult(sm.Index);
                 }
             }
             return result;
@@ -338,13 +338,15 @@ private void ScrollViewer_ViewChanged(object sender, ScrollViewerViewChangedEven
             if (ActivationState != CoreWindowActivationState.Deactivated)
             {
                 int bottomIndex = GetBottommostIndex();
+                int rawBottomIndex = Collection.GetRawIndex(bottomIndex);
                 long lastSeenIndex = SignalConversation.LastSeenMessageIndex;
-                if (lastSeenIndex < bottomIndex && LastMarkReadRequest < bottomIndex)
+                Logger.LogTrace("bottom={0} rawBottom={1} lastSeen={2} LastMarkReadRequest={3}", bottomIndex, rawBottomIndex, lastSeenIndex, LastMarkReadRequest);
+                if (lastSeenIndex <= rawBottomIndex && LastMarkReadRequest < rawBottomIndex)
                 {
-                    LastMarkReadRequest = bottomIndex;
+                    LastMarkReadRequest = rawBottomIndex;
                     Task.Run(async () =>
                     {
-                        await App.Handle.SetMessageRead(bottomIndex, ((SignalMessageContainer) Collection[bottomIndex]).Message, SignalConversation);
+                        await App.Handle.SetMessageRead(rawBottomIndex, ((SignalMessageContainer) Collection[bottomIndex]).Message, SignalConversation);
                     });
                 }
             }
diff --git a/Signal-Windows/Controls/VirtualizedMessagesCollection.cs b/Signal-Windows/Controls/VirtualizedMessagesCollection.cs
@@ -230,6 +230,25 @@ internal int GetVirtualIndex(int rawIndex)
             }
         }
 
+        public int GetRawIndex(int virtualIndex)
+        {
+            if (UnreadMarkerIndex > 0)
+            {
+                if (virtualIndex < UnreadMarkerIndex)
+                {
+                    return virtualIndex;
+                }
+                else
+                {
+                    return virtualIndex - 1;
+                }
+            }
+            else
+            {
+                return virtualIndex;
+            }
+        }
+
         public void Insert(int index, object value)
         {
             throw new NotImplementedException();
diff --git a/Signal-Windows/SignalWindowsFrontend.cs b/Signal-Windows/SignalWindowsFrontend.cs
@@ -77,9 +77,9 @@ public void HandleAttachmentStatusChanged(SignalAttachment sa)
             Locator.MainPageInstance.HandleAttachmentStatusChanged(sa);
         }
 
-        public void HandleMessageRead(long messageIndex, SignalConversation conversation)
+        public void HandleMessageRead(long unreadMarkerIndex, SignalConversation conversation)
         {
-            Locator.MainPageInstance.HandleMessageRead(messageIndex, conversation);
+            Locator.MainPageInstance.HandleMessageRead(unreadMarkerIndex, conversation);
             CheckNotification(conversation);
         }
 
diff --git a/Signal-Windows/ViewModels/MainPageViewModel.cs b/Signal-Windows/ViewModels/MainPageViewModel.cs
@@ -241,11 +241,11 @@ public AppendResult HandleMessage(SignalMessage message, SignalConversation conv
             return result;
         }
 
-        public void HandleMessageRead(long messageIndex, SignalConversation conversation)
+        public void HandleMessageRead(long unreadMarkerIndex, SignalConversation conversation)
         {
             var localConversation = ConversationsDictionary[conversation.ThreadId];
-            Logger.LogTrace("LastSeenMessageIndex = {0}", messageIndex);
-            localConversation.LastSeenMessageIndex = messageIndex;
+            Logger.LogTrace("LastSeenMessageIndex = {0}", unreadMarkerIndex);
+            localConversation.LastSeenMessageIndex = unreadMarkerIndex;
             localConversation.UnreadCount = conversation.UnreadCount;
             localConversation.UpdateUI();
         }

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ private void HandleMessage(SignalServiceEnvelope envelope)`
`157`	`157`	`{`
`158`	`158`	`try`
`159`	`159`	`{`
`160`		`- HandleReadMessage(readMessage);`
	`160`	`+ HandleSyncedReadMessage(readMessage);`
`161`	`161`	`}`
`162`	`162`	`catch(Exception e)`
`163`	`163`	`{`
`@@ -172,14 +172,10 @@ private void HandleMessage(SignalServiceEnvelope envelope)`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
`175`		`- private void HandleReadMessage(ReadMessage readMessage)`
	`175`	`+ private void HandleSyncedReadMessage(ReadMessage readMessage)`
`176`	`176`	`{`
`177`	`177`	`var conv = SignalDBContext.UpdateMessageRead(readMessage);`
`178`		`- long readIndex = conv.LastSeenMessageIndex - 1;`
`179`		`- if (readIndex > 0)`
`180`		`- {`
`181`		`- SignalLibHandle.Instance.DispatchMessageRead(conv.LastSeenMessageIndex - 1, conv).Wait();`
`182`		`- }`
	`178`	`+ SignalLibHandle.Instance.DispatchMessageRead(conv.LastSeenMessageIndex, conv).Wait();`
`183`	`179`	`}`
`184`	`180`
`185`	`181`	`private void HandleExpirationUpdateMessage(SignalServiceEnvelope envelope, SignalServiceContent content, SignalServiceDataMessage message, bool isSync, long timestamp)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public interface ISignalFrontend`
`40`	`40`	`void AddOrUpdateConversation(SignalConversation conversation, SignalMessage updateMessage);`
`41`	`41`	`AppendResult HandleMessage(SignalMessage message, SignalConversation conversation);`
`42`	`42`	`void HandleUnreadMessage(SignalMessage message);`
`43`		`- void HandleMessageRead(long messageIndex, SignalConversation conversation);`
	`43`	`+ void HandleMessageRead(long unreadMarkerIndex, SignalConversation conversation);`
`44`	`44`	`void HandleIdentitykeyChange(LinkedList<SignalMessage> messages);`
`45`	`45`	`void HandleMessageUpdate(SignalMessage updatedMessage);`
`46`	`46`	`void ReplaceConversationList(List<SignalConversation> conversations);`
`@@ -345,7 +345,7 @@ public async Task SetMessageRead(long index, SignalMessage message, SignalConver`
`345`	`345`	`OutgoingMessages.SendMessage(SignalServiceSyncMessage.forRead(new List<ReadMessage>() {`
`346`	`346`	`new ReadMessage(message.Author.ThreadId, message.ComposedTimestamp)`
`347`	`347`	`}));`
`348`		`- await DispatchMessageRead(index, conversation);`
	`348`	`+ await DispatchMessageRead(index + 1, conversation);`
`349`	`349`	`}`
`350`	`350`	`finally`
`351`	`351`	`{`
`@@ -495,7 +495,7 @@ internal void DispatchHandleMessage(SignalMessage message, SignalConversation co`
`495`	`495`	`if (result != null)`
`496`	`496`	`{`
`497`	`497`	`SignalDBContext.UpdateMessageRead(result.Index, conversation);`
`498`		`- DispatchMessageRead(result.Index, conversation).Wait();`
	`498`	`+ DispatchMessageRead(result.Index + 1, conversation).Wait();`
`499`	`499`	`wasInstantlyRead = true;`
`500`	`500`	`break;`
`501`	`501`	`}`
`@@ -520,14 +520,14 @@ internal void DispatchHandleUnreadMessage(SignalMessage message)`
`520`	`520`	`Task.WaitAll(operations.ToArray());`
`521`	`521`	`}`
`522`	`522`
`523`		`- internal async Task DispatchMessageRead(long messageIndex, SignalConversation conversation)`
	`523`	`+ internal async Task DispatchMessageRead(long unreadMarkerIndex, SignalConversation conversation)`
`524`	`524`	`{`
`525`	`525`	`List<Task> operations = new List<Task>();`
`526`	`526`	`foreach (var dispatcher in Frames.Keys)`
`527`	`527`	`{`
`528`	`528`	`operations.Add(dispatcher.RunTaskAsync(() =>`
`529`	`529`	`{`
`530`		`- Frames[dispatcher].HandleMessageRead(messageIndex, conversation);`
	`530`	`+ Frames[dispatcher].HandleMessageRead(unreadMarkerIndex, conversation);`
`531`	`531`	`}));`
`532`	`532`	`}`
`533`	`533`	`foreach (var waitHandle in operations)`
Original file line number	Diff line number	Diff line change
`@@ -1044,6 +1044,7 @@ private static SignalConversation GetSignalConversation(SignalDBContext ctx, str`
`1044`	`1044`	`internal static SignalConversation UpdateMessageRead(long index, SignalConversation conversation)`
`1045`	`1045`	`{`
`1046`	`1046`	`SignalConversation dbConversation = null;`
	`1047`	`+ long newMarkerIndex = index + 1;`
`1047`	`1048`	`lock (DBLock)`
`1048`	`1049`	`{`
`1049`	`1050`	`using (var ctx = new SignalDBContext())`
`@@ -1055,7 +1056,7 @@ internal static SignalConversation UpdateMessageRead(long index, SignalConversat`
`1055`	`1056`	`.SingleOrDefault();`
`1056`	`1057`	`if (contact != null)`
`1057`	`1058`	`{`
`1058`		`- contact.LastSeenMessageIndex = Math.Max(index, contact.LastSeenMessageIndex);`
	`1059`	`+ contact.LastSeenMessageIndex = Math.Max(newMarkerIndex, contact.LastSeenMessageIndex);`
`1059`	`1060`	`contact.UnreadCount = (uint)(contact.MessagesCount - contact.LastSeenMessageIndex);`
`1060`	`1061`	`dbConversation = contact;`
`1061`	`1062`	`}`
`@@ -1067,7 +1068,7 @@ internal static SignalConversation UpdateMessageRead(long index, SignalConversat`
`1067`	`1068`	`.SingleOrDefault();`
`1068`	`1069`	`if (group != null)`
`1069`	`1070`	`{`
`1070`		`- group.LastSeenMessageIndex = Math.Max(index, group.LastSeenMessageIndex);`
	`1071`	`+ group.LastSeenMessageIndex = Math.Max(newMarkerIndex, group.LastSeenMessageIndex);`
`1071`	`1072`	`group.UnreadCount = (uint)(group.MessagesCount - group.LastSeenMessageIndex);`
`1072`	`1073`	`dbConversation = group;`
`1073`	`1074`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ public AppendResult Append(SignalMessageContainer sm)`
`243`	`243`	`ScrollToBottom();`
`244`	`244`	`if (ActivationState != CoreWindowActivationState.Deactivated)`
`245`	`245`	`{`
`246`		`- result = new AppendResult(sm.Index + 1);`
	`246`	`+ result = new AppendResult(sm.Index);`
`247`	`247`	`}`
`248`	`248`	`}`
`249`	`249`	`return result;`
`@@ -338,13 +338,15 @@ private void ScrollViewer_ViewChanged(object sender, ScrollViewerViewChangedEven`
`338`	`338`	`if (ActivationState != CoreWindowActivationState.Deactivated)`
`339`	`339`	`{`
`340`	`340`	`int bottomIndex = GetBottommostIndex();`
	`341`	`+ int rawBottomIndex = Collection.GetRawIndex(bottomIndex);`
`341`	`342`	`long lastSeenIndex = SignalConversation.LastSeenMessageIndex;`
`342`		`- if (lastSeenIndex < bottomIndex && LastMarkReadRequest < bottomIndex)`
	`343`	`+ Logger.LogTrace("bottom={0} rawBottom={1} lastSeen={2} LastMarkReadRequest={3}", bottomIndex, rawBottomIndex, lastSeenIndex, LastMarkReadRequest);`
	`344`	`+ if (lastSeenIndex <= rawBottomIndex && LastMarkReadRequest < rawBottomIndex)`
`343`	`345`	`{`
`344`		`- LastMarkReadRequest = bottomIndex;`
	`346`	`+ LastMarkReadRequest = rawBottomIndex;`
`345`	`347`	`Task.Run(async () =>`
`346`	`348`	`{`
`347`		`- await App.Handle.SetMessageRead(bottomIndex, ((SignalMessageContainer) Collection[bottomIndex]).Message, SignalConversation);`
	`349`	`+ await App.Handle.SetMessageRead(rawBottomIndex, ((SignalMessageContainer) Collection[bottomIndex]).Message, SignalConversation);`
`348`	`350`	`});`
`349`	`351`	`}`
`350`	`352`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,9 @@ public void HandleAttachmentStatusChanged(SignalAttachment sa)`
`77`	`77`	`Locator.MainPageInstance.HandleAttachmentStatusChanged(sa);`
`78`	`78`	`}`
`79`	`79`
`80`		`- public void HandleMessageRead(long messageIndex, SignalConversation conversation)`
	`80`	`+ public void HandleMessageRead(long unreadMarkerIndex, SignalConversation conversation)`
`81`	`81`	`{`
`82`		`- Locator.MainPageInstance.HandleMessageRead(messageIndex, conversation);`
	`82`	`+ Locator.MainPageInstance.HandleMessageRead(unreadMarkerIndex, conversation);`
`83`	`83`	`CheckNotification(conversation);`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -241,11 +241,11 @@ public AppendResult HandleMessage(SignalMessage message, SignalConversation conv`
`241`	`241`	`return result;`
`242`	`242`	`}`
`243`	`243`
`244`		`- public void HandleMessageRead(long messageIndex, SignalConversation conversation)`
	`244`	`+ public void HandleMessageRead(long unreadMarkerIndex, SignalConversation conversation)`
`245`	`245`	`{`
`246`	`246`	`var localConversation = ConversationsDictionary[conversation.ThreadId];`
`247`		`- Logger.LogTrace("LastSeenMessageIndex = {0}", messageIndex);`
`248`		`- localConversation.LastSeenMessageIndex = messageIndex;`
	`247`	`+ Logger.LogTrace("LastSeenMessageIndex = {0}", unreadMarkerIndex);`
	`248`	`+ localConversation.LastSeenMessageIndex = unreadMarkerIndex;`
`249`	`249`	`localConversation.UnreadCount = conversation.UnreadCount;`
`250`	`250`	`localConversation.UpdateUI();`
`251`	`251`	`}`