diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java index f6f3999bc..f9185ffe4 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 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); } }