Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-27 12:15:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use 'deleted account' as name for certain unregisterd user cases.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-02-07 13:12:23 -05:00
parent 976e146248
commit 3d84fc9c98
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@@ -561,7 +561,7 @@ public class Recipient {
String name = getNameFromLocalData(context);
if (Util.isEmpty(name)) {
name = context.getString(R.string.Recipient_unknown);
name = getUnknownDisplayName(context);
}
return StringUtil.isolateBidi(name);
@@ -575,7 +575,7 @@ public class Recipient {
}
if (Util.isEmpty(name)) {
name = StringUtil.isolateBidi(context.getString(R.string.Recipient_unknown));
name = StringUtil.isolateBidi(getUnknownDisplayName(context));
}
return StringUtil.isolateBidi(name);
@@ -659,6 +659,14 @@ public class Recipient {
return StringUtil.isolateBidi(name);
}
private String getUnknownDisplayName(@NonNull Context context) {
if (getRegistered() == RegisteredState.NOT_REGISTERED) {
return context.getString(R.string.Recipient_deleted_account);
} else {
return context.getString(R.string.Recipient_unknown);
}
}
public @NonNull Optional<ServiceId> getServiceId() {
return OptionalUtil.or(Optional.ofNullable(aci), Optional.ofNullable(pni));
}

2
app/src/main/res/values/strings.xml
View File

@@ -3842,6 +3842,8 @@
<string name="prompt_passphrase_activity__signal_is_locked">Signal is locked</string>
<string name="prompt_passphrase_activity__tap_to_unlock">TAP TO UNLOCK</string>
<string name="Recipient_unknown">Unknown</string>
<!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
<string name="Recipient_deleted_account">Deleted account</string>
<!-- Option in settings that will take use to re-register if they are no longer registered -->
<string name="preferences_account_reregister">Re-register account</string>