From 0fd8f73cca9bac5a9918bb7ec171848df5e5b34f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 4 Jan 2023 10:03:30 -0500
Subject: [PATCH] Show username if appropriate in group chips.

---
 .../org/thoughtcrime/securesms/contacts/SelectedContacts.kt  | 2 +-
 .../org/thoughtcrime/securesms/recipients/Recipient.java     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectedContacts.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectedContacts.kt
index 3018e5785..9ced4e5b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectedContacts.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectedContacts.kt
@@ -30,7 +30,7 @@ object SelectedContacts {
     private val chip: ContactChip = itemView.findViewById(R.id.contact_chip)
 
     override fun bind(model: Model) {
-      chip.text = model.recipient.getShortDisplayName(context)
+      chip.text = model.recipient.getShortDisplayNameIncludingUsername(context)
       chip.setContact(model.selectedContact)
       chip.isCloseIconVisible = true
       chip.setOnCloseIconClickListener {
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 cdd934945..b9f118884 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -650,8 +650,9 @@ public class Recipient {
     String name = Util.getFirstNonEmpty(getGroupName(context),
                                         getSystemProfileName().getGivenName(),
                                         getProfileName().getGivenName(),
-                                        getDisplayName(context),
-                                        getUsername().orElse(null));
+                                        getE164().orElse(null),
+                                        getUsername().orElse(null),
+                                        getDisplayName(context));
 
     return StringUtil.isolateBidi(name);
   }