From 3d84fc9c983e91eb1b9023b65f8d955553e21afd Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 7 Feb 2024 13:12:23 -0500
Subject: [PATCH] Use 'deleted account' as name for certain unregisterd user
 cases.

---
 .../thoughtcrime/securesms/recipients/Recipient.java | 12 ++++++++++--
 app/src/main/res/values/strings.xml                  |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

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<ServiceId> 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 @@
     <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>