diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java index 70937099cc..830529a276 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java @@ -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 getServiceId() { return OptionalUtil.or(Optional.ofNullable(aci), Optional.ofNullable(pni)); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a344423fe..b3478f1eda 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3842,6 +3842,8 @@ Signal is locked TAP TO UNLOCK Unknown + + Deleted account Re-register account