From 01705459cf20a2e9de1eff9fa084d8cd1fe80894 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 10 Apr 2026 16:18:08 -0400
Subject: [PATCH] Include registered state in support email.

---
 .../thoughtcrime/securesms/util/SupportEmailUtil.java | 11 ++++++++++-
 app/src/main/res/values/strings.xml                   |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java
index ccd89bd7e9..7a5daab42a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java
@@ -12,7 +12,9 @@ import org.signal.core.util.ResourceUtil;
 import org.signal.core.util.Util;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
@@ -71,7 +73,9 @@ public final class SupportEmailUtil {
            "\n" +
            context.getString(R.string.SupportEmailUtil_locale) + " " + Locale.getDefault().toString() +
            "\n" +
-           context.getString(R.string.SupportEmailUtil_challenge_received) + " " + getChallengeReceived();
+           context.getString(R.string.SupportEmailUtil_challenge_received) + " " + getChallengeReceived() +
+           "\n" +
+           context.getString(R.string.SupportEmailUtil_registered) + " " + getRegistered(context);
   }
 
   private static CharSequence getDeviceInfo() {
@@ -100,4 +104,9 @@ public final class SupportEmailUtil {
 
     return receivedRecently ? "yes" : "no";
   }
+
+  private static String getRegistered(Context context) {
+    boolean registered = SignalStore.account().isRegistered() && !TextSecurePreferences.isUnauthorizedReceived(context);
+    return registered ? "yes" : "no";
+  }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b9af3b6f8..4b61c4f177 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3087,6 +3087,7 @@
     <string name="SupportEmailUtil_registration_lock">Registration lock:</string>
     <string name="SupportEmailUtil_locale" translatable="false">Locale:</string>
     <string name="SupportEmailUtil_challenge_received" translatable="false">Challenge Received:</string>
+    <string name="SupportEmailUtil_registered" translatable="false">Registered:</string>
 
     <!-- ThreadRecord -->
     <string name="ThreadRecord_group_updated">Group updated</string>