Ensure old typing observers are unsubscribed.

signalapp · Mar 30, 2020 · af2e17d · af2e17d
1 parent 728ec1c
commit af2e17d
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -398,6 +398,8 @@ private static void presentMessageRequestProfileView(@NonNull Context context, @
   }
 
   private void initializeResources() {
+    long oldThreadId = threadId;
+
     this.recipient         = Recipient.live(getActivity().getIntent().getParcelableExtra(ConversationActivity.RECIPIENT_EXTRA));
     this.threadId          = this.getActivity().getIntent().getLongExtra(ConversationActivity.THREAD_ID_EXTRA, -1);
     this.lastSeen          = this.getActivity().getIntent().getLongExtra(ConversationActivity.LAST_SEEN_EXTRA, -1);
@@ -407,6 +409,10 @@ private void initializeResources() {
 
     OnScrollListener scrollListener = new ConversationScrollListener(getActivity());
     list.addOnScrollListener(scrollListener);
+
+    if (oldThreadId != threadId) {
+      ApplicationContext.getInstance(requireContext()).getTypingStatusRepository().getTypists(oldThreadId).removeObservers(this);
+    }
   }
 
   private void initializeListAdapter() {
@@ -440,6 +446,7 @@ private void initializeTypingObserver() {
       return;
     }
 
+    ApplicationContext.getInstance(requireContext()).getTypingStatusRepository().getTypists(threadId).removeObservers(this);
     ApplicationContext.getInstance(requireContext()).getTypingStatusRepository().getTypists(threadId).observe(this, typingState ->  {
       List<Recipient> recipients;
       boolean         replacedByIncomingMessage;