empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix incorrect mark as read behavior when leaving conversation.

Browse source
This commit is contained in:
Cody Henthorne 2021-06-21 19:53:23 -04:00
parent 4932623937
commit a1aafd7453
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View file

@ -629,7 +629,7 @@ public class ConversationFragment extends LoggingFragment {
this.recipient = Recipient.live(conversationViewModel.getArgs().getRecipientId()); this.recipient = Recipient.live(conversationViewModel.getArgs().getRecipientId());
this.threadId = conversationViewModel.getArgs().getThreadId(); this.threadId = conversationViewModel.getArgs().getThreadId();
this.markReadHelper = new MarkReadHelper(threadId, requireContext()); this.markReadHelper = new MarkReadHelper(threadId, requireContext(), getViewLifecycleOwner());
conversationViewModel.onConversationDataAvailable(recipient.getId(), threadId, startingPosition); conversationViewModel.onConversationDataAvailable(recipient.getId(), threadId, startingPosition);
messageCountsViewModel.setThreadId(threadId); messageCountsViewModel.setThreadId(threadId);
@ -806,7 +806,7 @@ public class ConversationFragment extends LoggingFragment {
snapToTopDataObserver.requestScrollPosition(0); snapToTopDataObserver.requestScrollPosition(0);
conversationViewModel.onConversationDataAvailable(recipient.getId(), threadId, -1); conversationViewModel.onConversationDataAvailable(recipient.getId(), threadId, -1);
messageCountsViewModel.setThreadId(threadId); messageCountsViewModel.setThreadId(threadId);
markReadHelper = new MarkReadHelper(threadId, requireContext()); markReadHelper = new MarkReadHelper(threadId, requireContext(), getViewLifecycleOwner());
initializeListAdapter(); initializeListAdapter();
initializeTypingObserver(); initializeTypingObserver();
} }

8
app/src/main/java/org/thoughtcrime/securesms/conversation/MarkReadHelper.java
View file

@ -3,6 +3,8 @@ package org.thoughtcrime.securesms.conversation;
import android.content.Context; import android.content.Context;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner;
import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log; import org.signal.core.util.logging.Log;
@ -25,16 +27,18 @@ class MarkReadHelper {
private final long threadId; private final long threadId;
private final Context context; private final Context context;
private final LifecycleOwner lifecycleOwner;
private final Debouncer debouncer = new Debouncer(DEBOUNCE_TIMEOUT); private final Debouncer debouncer = new Debouncer(DEBOUNCE_TIMEOUT);
private long latestTimestamp; private long latestTimestamp;
MarkReadHelper(long threadId, @NonNull Context context) { MarkReadHelper(long threadId, @NonNull Context context, @NonNull LifecycleOwner lifecycleOwner) {
this.threadId = threadId; this.threadId = threadId;
this.context = context.getApplicationContext(); this.context = context.getApplicationContext();
this.lifecycleOwner = lifecycleOwner;
} }
public void onViewsRevealed(long timestamp) { public void onViewsRevealed(long timestamp) {
if (timestamp <= latestTimestamp) { if (timestamp <= latestTimestamp || lifecycleOwner.getLifecycle().getCurrentState() != Lifecycle.State.RESUMED) {
return; return;
} }