From 38cf3f40e1e97ab97dd562b409a84277b4fa853b Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 29 Nov 2023 10:03:02 -0500 Subject: [PATCH] Fix various places where we should show the username. --- .../securesms/groups/ui/addmembers/AddMembersActivity.java | 2 +- .../securesms/groups/ui/addtogroup/AddToGroupViewModel.java | 2 +- .../groups/ui/managegroup/dialogs/GroupInviteSentDialog.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java index d13f678f9a..652e894bf2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java @@ -141,7 +141,7 @@ public class AddMembersActivity extends PushContactSelectionActivity { Recipient recipient = Util.firstNonNull(state.getRecipient(), Recipient.UNKNOWN); String message = getResources().getQuantityString(R.plurals.AddMembersActivity__add_d_members_to_s, state.getSelectionCount(), - recipient.getDisplayName(this), state.getGroupTitle(), state.getSelectionCount()); + recipient.getDisplayNameOrUsername(this), state.getGroupTitle(), state.getSelectionCount()); new MaterialAlertDialogBuilder(this) .setMessage(message) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java index 40229da773..5303a7006d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java @@ -47,7 +47,7 @@ public final class AddToGroupViewModel extends ViewModel { SignalExecutors.BOUNDED.execute(() -> { Recipient recipient = Recipient.resolved(recipientId); Recipient groupRecipient = Recipient.resolved(groupRecipientIds.get(0)); - String recipientName = recipient.getDisplayName(context); + String recipientName = recipient.getDisplayNameOrUsername(context); String groupName = groupRecipient.getDisplayName(context); if (groupRecipient.getGroupId().get().isV1() && !recipient.hasE164()) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupInviteSentDialog.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupInviteSentDialog.java index 11914bc7b0..3661bb7cbe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupInviteSentDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupInviteSentDialog.java @@ -36,7 +36,7 @@ public final class GroupInviteSentDialog { // }) .setPositiveButton(android.R.string.ok, null); if (size == 1) { - builder.setMessage(context.getString(R.string.GroupManagement_invite_single_user, recipients.get(0).getDisplayName(context))); + builder.setMessage(context.getString(R.string.GroupManagement_invite_single_user, recipients.get(0).getDisplayNameOrUsername(context))); } else { builder.setMessage(R.string.GroupManagement_invite_multiple_users) .setView(R.layout.dialog_multiple_group_invites_sent);