empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Show username if appropriate in group chips.

Browse source
This commit is contained in:
Greyson Parrelli 2023-01-04 10:03:30 -05:00
parent b9fc36be5a
commit 0fd8f73cca
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/contacts/SelectedContacts.kt
View file

@ -30,7 +30,7 @@ object SelectedContacts {
private val chip: ContactChip = itemView.findViewById(R.id.contact_chip) private val chip: ContactChip = itemView.findViewById(R.id.contact_chip)
override fun bind(model: Model) { override fun bind(model: Model) {
chip.text = model.recipient.getShortDisplayName(context) chip.text = model.recipient.getShortDisplayNameIncludingUsername(context)
chip.setContact(model.selectedContact) chip.setContact(model.selectedContact)
chip.isCloseIconVisible = true chip.isCloseIconVisible = true
chip.setOnCloseIconClickListener { chip.setOnCloseIconClickListener {

5
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
View file

@ -650,8 +650,9 @@ public class Recipient {
String name = Util.getFirstNonEmpty(getGroupName(context), String name = Util.getFirstNonEmpty(getGroupName(context),
getSystemProfileName().getGivenName(), getSystemProfileName().getGivenName(),
getProfileName().getGivenName(), getProfileName().getGivenName(),
getDisplayName(context), getE164().orElse(null),
getUsername().orElse(null)); getUsername().orElse(null),
getDisplayName(context));
return StringUtil.isolateBidi(name); return StringUtil.isolateBidi(name);
} }