From 4bd3094badf1bb052eea4fa9e18a92c7d055c9ac Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Fri, 13 Oct 2017 09:51:37 -0700
Subject: [PATCH] Fix problem where recycled group avatar icons have stale
 listener

Fixes #7089
// FREEBIE
---
 .../securesms/components/AvatarImageView.java | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/components/AvatarImageView.java b/src/org/thoughtcrime/securesms/components/AvatarImageView.java
index 9fea72dbf1..992d1c3cb5 100644
--- a/src/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/src/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -58,21 +58,18 @@ public class AvatarImageView extends ImageView {
 
   private void setAvatarClickHandler(final Recipient recipient, boolean quickContactEnabled) {
     if (!recipient.isGroupRecipient() && quickContactEnabled) {
-      setOnClickListener(new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-          if (recipient.getContactUri() != null) {
-            ContactsContract.QuickContact.showQuickContact(getContext(), AvatarImageView.this, recipient.getContactUri(), ContactsContract.QuickContact.MODE_LARGE, null);
+      super.setOnClickListener(v -> {
+        if (recipient.getContactUri() != null) {
+          ContactsContract.QuickContact.showQuickContact(getContext(), AvatarImageView.this, recipient.getContactUri(), ContactsContract.QuickContact.MODE_LARGE, null);
+        } else {
+          final Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
+          if (recipient.getAddress().isEmail()) {
+            intent.putExtra(ContactsContract.Intents.Insert.EMAIL, recipient.getAddress().toEmailString());
           } else {
-            final Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
-            if (recipient.getAddress().isEmail()) {
-              intent.putExtra(ContactsContract.Intents.Insert.EMAIL, recipient.getAddress().toEmailString());
-            } else {
-              intent.putExtra(ContactsContract.Intents.Insert.PHONE, recipient.getAddress().toPhoneString());
-            }
-            intent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
-            getContext().startActivity(intent);
+            intent.putExtra(ContactsContract.Intents.Insert.PHONE, recipient.getAddress().toPhoneString());
           }
+          intent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
+          getContext().startActivity(intent);
         }
       });
     } else {