From a73db5eeaefb6ffeeb9611e0588dde9e7fe80e95 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 30 Jul 2026 12:39:44 -0300
Subject: [PATCH] Fix focus bug with image view cycling focusability.

---
 .../thoughtcrime/securesms/components/AvatarImageView.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
index b634b55fe8..313f9f4db2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -292,6 +292,10 @@ public final class AvatarImageView extends AppCompatImageView {
   }
 
   public void disableQuickContact() {
+    if (listener == null && !isClickable() && !hasOnClickListeners()) {
+      return;
+    }
+
     super.setOnClickListener(listener);
     setClickable(listener != null);
   }