From f60a88b6f75c941ca6552ae4baafe9f1058c8f81 Mon Sep 17 00:00:00 2001 From: Hocuri Date: Wed, 14 Oct 2020 11:25:48 +0200 Subject: [PATCH 1/2] Don't use quickContact in the ConversationListItem quickContact means that you get to the contact details screen by clicking the avatar. In the conversations list this is usually disabled, just for the search it stayed enabled, which was unexpected (because it was usually disabled ;-) ). Even worse, in the search clicking the avatar sometimes got me to the wrong contact details. No idea why, but I think disabling is better anyway. --- src/org/thoughtcrime/securesms/ConversationListItem.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java index 794a149c5..56d4d1d7d 100644 --- a/src/org/thoughtcrime/securesms/ConversationListItem.java +++ b/src/org/thoughtcrime/securesms/ConversationListItem.java @@ -213,7 +213,7 @@ public class ConversationListItem extends RelativeLayout deliveryStatusIndicator.setNone(); setBatchState(false); - contactPhotoImage.setAvatar(glideRequests, recipient, true); + contactPhotoImage.setAvatar(glideRequests, recipient, false); } public void bind(@NonNull DcMsg messageResult, @@ -244,7 +244,7 @@ public class ConversationListItem extends RelativeLayout deliveryStatusIndicator.setNone(); setBatchState(false); - contactPhotoImage.setAvatar(glideRequests, recipient, true); + contactPhotoImage.setAvatar(glideRequests, recipient, false); } @Override From f9771fc546a8cb1eb23ea0bef595fab1ff8d3fdc Mon Sep 17 00:00:00 2001 From: Hocuri Date: Wed, 14 Oct 2020 13:43:01 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Also,=20when=20one=20clicked=20on=20the=20c?= =?UTF-8?q?ontact=20photo=20in=20the=20contact=20selection=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …list (the one that appears when the "+" is clicked), nothing happened; fix that too --- src/org/thoughtcrime/securesms/components/AvatarImageView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/components/AvatarImageView.java b/src/org/thoughtcrime/securesms/components/AvatarImageView.java index ef239777a..3ecd5a680 100644 --- a/src/org/thoughtcrime/securesms/components/AvatarImageView.java +++ b/src/org/thoughtcrime/securesms/components/AvatarImageView.java @@ -59,7 +59,7 @@ public class AvatarImageView extends AppCompatImageView { } } else { setImageDrawable(new GeneratedContactPhoto("+").asDrawable(getContext(), ThemeUtil.getDummyContactColor(getContext()))); - super.setOnClickListener(listener); + if (listener != null) super.setOnClickListener(listener); } }