Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show username in all display name locations if only option.

Browse Source
This commit is contained in:
Cody Henthorne
2024-02-27 11:01:05 -05:00
committed by Alex Hart
parent c10c64a6a6
commit 5b2c458bcf
18 changed files with 22 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/sharing/ShareSelectionMappingModel.java
View File

@@ -22,7 +22,7 @@ public class ShareSelectionMappingModel implements MappingModel<ShareSelectionMa
String name = shareContact.getRecipientId()
.map(Recipient::resolved)
.map(recipient -> recipient.isSelf() ? context.getString(R.string.note_to_self)
: recipient.getShortDisplayNameIncludingUsername(context))
: recipient.getShortDisplayName(context))
.orElseGet(shareContact::getNumber);
return isFirst ? name : context.getString(R.string.ShareActivity__comma_s, name);

2
app/src/main/java/org/thoughtcrime/securesms/sharing/interstitial/ShareInterstitialMappingModel.java
View File

@@ -21,7 +21,7 @@ class ShareInterstitialMappingModel extends RecipientMappingModel<ShareInterstit
@Override
public @NonNull String getName(@NonNull Context context) {
String name = recipient.isSelf() ? context.getString(R.string.note_to_self)
: recipient.getShortDisplayNameIncludingUsername(context);
: recipient.getShortDisplayName(context);
return isFirst ? name : context.getString(R.string.ShareActivity__comma_s, name);
}