From 763e891dfdbb2afd6ff29df1799a9053209a54bc Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Thu, 22 Feb 2024 14:23:36 -0500
Subject: [PATCH] Show username in group invite flow.

---
 .../database/model/GroupsV2UpdateMessageProducer.java         | 2 +-
 .../java/org/thoughtcrime/securesms/recipients/Recipient.java | 2 +-
 .../thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt  | 4 ++--
 .../ui/bottomsheet/RecipientBottomSheetDialogFragment.java    | 2 +-
 .../database/model/GroupsV2UpdateMessageProducerTest.java     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
index bb0fe2d825..f41da6c02d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
@@ -1541,7 +1541,7 @@ final class GroupsV2UpdateMessageProducer {
         String beforeChunk = template.substring(startIndex, nearestPosition);
 
         builder.append(beforeChunk);
-        builder.append(SpanUtil.clickable(Recipient.resolved(recipientId).getDisplayName(context), ContextCompat.getColor(context, R.color.conversation_item_update_text_color), v -> {
+        builder.append(SpanUtil.clickable(Recipient.resolved(recipientId).getDisplayNameOrUsername(context), ContextCompat.getColor(context, R.color.conversation_item_update_text_color), v -> {
           if (!recipientId.isUnknown() && clickHandler != null) {
             clickHandler.accept(recipientId);
           }
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 35d86e47e6..6452bc06c6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -652,7 +652,7 @@ public class Recipient {
     String name = Util.getFirstNonEmpty(getGroupName(context),
                                         getSystemProfileName().getGivenName(),
                                         getProfileName().getGivenName(),
-                                        getE164().orElse(null),
+                                        shouldShowE164() ? getE164().orElse(null) : null,
                                         getUsername().orElse(null),
                                         getDisplayName(context));
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
index 4db9e45db2..da9954ccaa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
@@ -89,8 +89,8 @@ class AboutSheet : ComposeBottomSheetDialogFragment() {
         model = AboutModel(
           isSelf = recipient.get().isSelf,
           hasAvatar = recipient.get().profileAvatarFileDetails.hasFile(),
-          displayName = recipient.get().getDisplayName(requireContext()),
-          shortName = recipient.get().getShortDisplayName(requireContext()),
+          displayName = recipient.get().getDisplayNameOrUsername(requireContext()),
+          shortName = recipient.get().getShortDisplayNameIncludingUsername(requireContext()),
           about = recipient.get().about,
           verified = verified,
           recipientForAvatar = recipient.get(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
index 3f5759dfee..6e76866ad4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
@@ -184,7 +184,7 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF
       }
 
       String name = recipient.isSelf() ? requireContext().getString(R.string.note_to_self)
-                                       : recipient.getDisplayName(requireContext());
+                                       : recipient.getDisplayNameOrUsername(requireContext());
       fullName.setVisibility(TextUtils.isEmpty(name) ? View.GONE : View.VISIBLE);
       SpannableStringBuilder nameBuilder = new SpannableStringBuilder(name);
       if (recipient.showVerified()) {
diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducerTest.java b/app/src/test/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducerTest.java
index 86a926d9bf..72cd7a2048 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducerTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducerTest.java
@@ -98,7 +98,7 @@ public final class GroupsV2UpdateMessageProducerTest {
   private static Recipient recipientWithName(RecipientId id, String name) {
     Recipient recipient = mock(Recipient.class);
     when(recipient.getId()).thenReturn(id);
-    when(recipient.getDisplayName(any())).thenReturn(name);
+    when(recipient.getDisplayNameOrUsername(any())).thenReturn(name);
     return recipient;
   }