Add registration lock status to support email.

signalapp · Jun 2, 2020 · 263af7c · 263af7c
1 parent 7f2439f
commit 263af7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java
@@ -8,6 +8,7 @@
 
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 
 import java.util.Locale;
 
@@ -45,6 +46,8 @@ private SupportEmailUtil() { }
            "\n" +
            context.getString(R.string.SupportEmailUtil_signal_package) + " " + getSignalPackage(context) +
            "\n" +
+           context.getString(R.string.SupportEmailUtil_registration_lock) + " " + getRegistrationLockEnabled(context) +
+           "\n" +
            context.getString(R.string.SupportEmailUtil_locale) + " " + Locale.getDefault().toString();
   }
 
@@ -63,4 +66,8 @@ private static CharSequence getSignalVersion() {
   private static CharSequence getSignalPackage(@NonNull Context context) {
     return String.format("%s (%s)", BuildConfig.APPLICATION_ID, AppSignatureUtil.getAppSignature(context).or("Unknown"));
   }
+
+  private static CharSequence getRegistrationLockEnabled(@NonNull Context context) {
+    return String.valueOf(TextSecurePreferences.isV1RegistrationLockEnabled(context) || SignalStore.kbsValues().isV2RegistrationLockEnabled());
+  }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1089,6 +1089,7 @@
     <string name="SupportEmailUtil_android_version">Android version:</string>
     <string name="SupportEmailUtil_signal_version">Signal version:</string>
     <string name="SupportEmailUtil_signal_package">Signal package:</string>
+    <string name="SupportEmailUtil_registration_lock">Registration lock:</string>
     <string name="SupportEmailUtil_locale">Locale:</string>
 
     <!-- ThreadRecord -->