From ff633ddd59a2e8e6c3749ece64842ed5420688ce Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 4 Nov 2021 11:09:27 -0400
Subject: [PATCH] Stop observing LiveRecipient in contact list when detached.

---
 .../contacts/ContactSelectionListAdapter.java         |  2 +-
 .../securesms/contacts/ContactSelectionListItem.java  | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
index 34672ebbc4..82ae02c5df 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
@@ -141,7 +141,7 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
 
     @Override
     public void unbind(@NonNull GlideRequests glideRequests) {
-      getView().unbind(glideRequests);
+      getView().unbind();
     }
 
     @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
index f20389f98f..5e8cee61e6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
@@ -71,6 +71,12 @@ public class ContactSelectionListItem extends ConstraintLayout implements Recipi
     ViewUtil.setTextViewGravityStart(this.nameView, getContext());
   }
 
+  @Override
+  protected void onDetachedFromWindow() {
+    super.onDetachedFromWindow();
+    unbind();
+  }
+
   public void set(@NonNull GlideRequests glideRequests,
                   @Nullable RecipientId recipientId,
                   int type,
@@ -92,6 +98,9 @@ public class ContactSelectionListItem extends ConstraintLayout implements Recipi
       this.recipient = null;
       this.contactPhotoImage.setAvatar(glideRequests, null, false);
     } else if (recipientId != null) {
+      if (this.recipient != null) {
+        this.recipient.removeForeverObserver(this);
+      }
       this.recipient = Recipient.live(recipientId);
       this.recipient.observeForever(this);
     }
@@ -150,7 +159,7 @@ public class ContactSelectionListItem extends ConstraintLayout implements Recipi
     this.checkBox.setEnabled(enabled);
   }
 
-  public void unbind(GlideRequests glideRequests) {
+  public void unbind() {
     if (recipient != null) {
       recipient.removeForeverObserver(this);
       recipient = null;