From db2b64e58c180ae8047c83bbcf49bbc8b2e8672e Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 10 Jul 2020 17:14:35 -0400
Subject: [PATCH] Update PIN opt-out strings.

---
 .../securesms/pin/PinOptOutDialog.java            | 15 +++------------
 app/src/main/res/menu/pin_skip.xml                |  2 +-
 app/src/main/res/values/strings.xml               |  5 +----
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java
index cbd2f79fd3..ae0014ff17 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java
@@ -21,9 +21,6 @@ public final class PinOptOutDialog {
 
   public static void showForSkip(@NonNull Context context, @NonNull Runnable onSuccess, @NonNull Runnable onFailed) {
     show(context,
-         R.string.PinOptOutDialog_warning,
-         R.string.PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin,
-         R.string.PinOptOutDialog_skip_pin_creation,
          true,
          onSuccess,
          onFailed);
@@ -31,27 +28,21 @@ public final class PinOptOutDialog {
 
   public static void showForOptOut(@NonNull Context context, @NonNull Runnable onSuccess, @NonNull Runnable onFailed) {
     show(context,
-         R.string.PinOptOutDialog_warning,
-         R.string.PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin,
-         R.string.PinOptOutDialog_disable_pin,
          false,
          onSuccess,
          onFailed);
   }
 
   private static void show(@NonNull Context context,
-                           @StringRes int titleRes,
-                           @StringRes int bodyRes,
-                           @StringRes int buttonRes,
                            boolean skip,
                            @NonNull Runnable onSuccess,
                            @NonNull Runnable onFailed)
   {
     AlertDialog dialog = new AlertDialog.Builder(context)
-                                        .setTitle(titleRes)
-                                        .setMessage(bodyRes)
+                                        .setTitle(R.string.PinOptOutDialog_warning)
+                                        .setMessage(R.string.PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin)
                                         .setCancelable(true)
-                                        .setPositiveButton(buttonRes, (d, which) -> {
+                                        .setPositiveButton(R.string.PinOptOutDialog_disable_pin, (d, which) -> {
                                           d.dismiss();
                                           AlertDialog progress = SimpleProgressDialog.show(context);
 
diff --git a/app/src/main/res/menu/pin_skip.xml b/app/src/main/res/menu/pin_skip.xml
index ba8d216815..90c7cd59b3 100644
--- a/app/src/main/res/menu/pin_skip.xml
+++ b/app/src/main/res/menu/pin_skip.xml
@@ -10,6 +10,6 @@
 
   <item
       android:id="@+id/menu_pin_skip"
-      android:title="@string/KbsSplashFragment__skip_pin_creation"
+      android:title="@string/KbsSplashFragment__disable_pin"
       app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca08018e04..f9d47fba93 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -959,9 +959,6 @@
 
     <!-- PinOptOutDialog -->
     <string name="PinOptOutDialog_warning">Warning</string>
-    <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Skipping PIN creation will create a hidden, high-entropy PIN associated with your account that is unrecoverable. When you re-register Signal you will lose all data unless you manually back up and restore. You can not turn on Registration Lock while the PIN is disabled.</string>
-    <string name="PinOptOutDialog_skip_pin_creation">Skip PIN creation</string>
-    <string name="PinOptOutDialog_disable_pin_title">Disable PIN?</string>
     <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Disabling PIN will create a hidden, high-entropy PIN associated with your account that is unrecoverable. When you re-register Signal you will lose all data unless you manually back up and restore. You can not turn on Registration Lock while the PIN is disabled.</string>
     <string name="PinOptOutDialog_disable_pin">Disable PIN</string>
 
@@ -2194,7 +2191,7 @@
     <string name="KbsSplashFragment__update_pin">Update PIN</string>
     <string name="KbsSplashFragment__create_your_pin">Create your PIN</string>
     <string name="KbsSplashFragment__learn_more_about_pins">Learn more about PINs</string>
-    <string name="KbsSplashFragment__skip_pin_creation">Skip PIN creation</string>
+    <string name="KbsSplashFragment__disable_pin">Disable PIN</string>
 
     <!-- KBS Reminder Dialog -->
     <string name="KbsReminderDialog__enter_your_signal_pin">Enter your Signal PIN</string>