From cfd69f2da8580c421ac2f627ab1ffbe7a8f5b907 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 16 Apr 2021 10:37:23 -0300 Subject: [PATCH] Fix issue where we do not display initials for contacts we have names for. --- .../securesms/recipients/Recipient.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java index 03f510993..5f99b3a65 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java @@ -770,12 +770,14 @@ public class Recipient { } public @NonNull FallbackContactPhoto getFallbackContactPhoto(@NonNull FallbackPhotoProvider fallbackPhotoProvider) { - if (isSelf) return fallbackPhotoProvider.getPhotoForLocalNumber(); - else if (isResolving()) return fallbackPhotoProvider.getPhotoForResolvingRecipient(); - else if (isGroupInternal()) return fallbackPhotoProvider.getPhotoForGroup(); - else if (isGroup()) return fallbackPhotoProvider.getPhotoForGroup(); - else if (!TextUtils.isEmpty(groupName)) return fallbackPhotoProvider.getPhotoForRecipientWithName(groupName); - else return fallbackPhotoProvider.getPhotoForRecipientWithoutName(); + if (isSelf) return fallbackPhotoProvider.getPhotoForLocalNumber(); + else if (isResolving()) return fallbackPhotoProvider.getPhotoForResolvingRecipient(); + else if (isGroupInternal()) return fallbackPhotoProvider.getPhotoForGroup(); + else if (isGroup()) return fallbackPhotoProvider.getPhotoForGroup(); + else if (!TextUtils.isEmpty(groupName)) return fallbackPhotoProvider.getPhotoForRecipientWithName(groupName); + else if (!TextUtils.isEmpty(systemContactName)) return fallbackPhotoProvider.getPhotoForRecipientWithName(systemContactName); + else if (!signalProfileName.isEmpty()) return fallbackPhotoProvider.getPhotoForRecipientWithName(signalProfileName.toString()); + else return fallbackPhotoProvider.getPhotoForRecipientWithoutName(); } public @Nullable ContactPhoto getContactPhoto() {