mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-22 09:49:30 +01:00
Use 'deleted account' as name for certain unregisterd user cases.
This commit is contained in:
@@ -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));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user