Skip to content

Commit f429af0

Browse files
committed
Even more excessive logging
1 parent 2e41b19 commit f429af0

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

Signal-Windows/Controls/Conversation.xaml.cs

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -330,19 +330,27 @@ private void ConversationSettingsButton_Click(object sender, RoutedEventArgs e)
330330
private void ScrollViewer_ViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
331331
{
332332
int bottomIndex = GetBottommostIndex();
333-
Logger.LogTrace("ScrollViewer_ViewChanged() bottomIndex={}", bottomIndex);
333+
Logger.LogTrace("ScrollViewer_ViewChanged() bottomIndex={0}", bottomIndex);
334334
try
335335
{
336-
if (Window.Current.CoreWindow.ActivationMode == CoreWindowActivationMode.ActivatedInForeground &&
337-
SignalConversation.LastSeenMessageIndex < bottomIndex &&
338-
LastMarkReadRequest < bottomIndex)
336+
CoreWindow window = Window.Current.CoreWindow;
337+
Logger.LogTrace("ScrollViewer_ViewChanged() window={0}", window);
338+
CoreWindowActivationMode mode = window.ActivationMode;
339+
Logger.LogTrace("ScrollViewer_ViewChanged() mode={0}", mode);
340+
if (mode == CoreWindowActivationMode.ActivatedInForeground)
339341
{
340-
Logger.LogTrace("ScrollViewer_ViewChanged() setting index {0} as read", bottomIndex);
341-
LastMarkReadRequest = bottomIndex;
342-
Task.Run(async () =>
342+
Logger.LogTrace("ScrollViewer_ViewChanged() mode == CoreWindowActivationMode.ActivatedInForeground");
343+
long lastSeenIndex = SignalConversation.LastSeenMessageIndex;
344+
Logger.LogTrace("ScrollViewer_ViewChanged() lastSeenIndex={0} LastMarkReadRequest={1}", lastSeenIndex, LastMarkReadRequest);
345+
if (lastSeenIndex < bottomIndex && LastMarkReadRequest < bottomIndex)
343346
{
344-
await App.Handle.SetMessageRead(bottomIndex, SignalConversation);
345-
});
347+
Logger.LogTrace("ScrollViewer_ViewChanged() setting index {0} as read", bottomIndex);
348+
LastMarkReadRequest = bottomIndex;
349+
Task.Run(async () =>
350+
{
351+
await App.Handle.SetMessageRead(bottomIndex, SignalConversation);
352+
});
353+
}
346354
}
347355
}
348356
catch(Exception ex)

0 commit comments

Comments
 (0)