From a6786e5c2bb951f6fa0e5fae0ca07482e5a5461f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sun, 2 Feb 2020 23:19:25 -0500
Subject: [PATCH] Fix strings in KBS PIN flow.

---
 .../lock/v2/ConfirmKbsPinFragment.java          | 12 ++++++------
 .../securesms/lock/v2/CreateKbsPinFragment.java | 17 ++++++++---------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
index ac661fed3f..fb1293db04 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
@@ -32,9 +32,9 @@ public class ConfirmKbsPinFragment extends BaseKbsPinFragment<ConfirmKbsPinViewM
     args = ConfirmKbsPinFragmentArgs.fromBundle(requireArguments());
 
     if (args.getIsNewPin()) {
-      initializeViewStatesForNewPin();
+      initializeViewStatesForPinCreate();
     } else {
-      initializeViewStatesForPin();
+      initializeViewStatesForPinUpdate();
     }
   }
 
@@ -53,15 +53,15 @@ public class ConfirmKbsPinFragment extends BaseKbsPinFragment<ConfirmKbsPinViewM
     return viewModel;
   }
 
-  private void initializeViewStatesForNewPin() {
-    getTitle().setText(R.string.CreateKbsPinFragment__create_a_new_pin);
+  private void initializeViewStatesForPinCreate() {
+    getTitle().setText(R.string.CreateKbsPinFragment__create_your_pin);
     getDescription().setText(R.string.ConfirmKbsPinFragment__confirm_your_pin);
     getKeyboardToggle().setVisibility(View.INVISIBLE);
     getLabel().setText("");
   }
 
-  private void initializeViewStatesForPin() {
-    getTitle().setText(R.string.CreateKbsPinFragment__create_your_pin);
+  private void initializeViewStatesForPinUpdate() {
+    getTitle().setText(R.string.CreateKbsPinFragment__create_a_new_pin);
     getDescription().setText(R.string.ConfirmKbsPinFragment__confirm_your_pin);
     getKeyboardToggle().setVisibility(View.INVISIBLE);
     getLabel().setText("");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinFragment.java
index d99f4fd55b..a58fdcd9ec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinFragment.java
@@ -16,26 +16,25 @@ public class CreateKbsPinFragment extends BaseKbsPinFragment<CreateKbsPinViewMod
     args = CreateKbsPinFragmentArgs.fromBundle(requireArguments());
 
     if (args.getIsNewPin()) {
-      initializeViewStatesForNewPin();
+      initializeViewStatesForPinCreate();
     } else {
-      initializeViewStatesForPin();
+      initializeViewStatesForPinUpdate();
     }
 
     getLabel().setText(getPinLengthRestrictionText(R.plurals.CreateKbsPinFragment__pin_must_be_at_least_digits));
     getConfirm().setEnabled(false);
   }
 
-  private void initializeViewStatesForPin() {
-    getTitle().setText(R.string.CreateKbsPinFragment__create_your_pin);
-    getDescription().setText(R.string.CreateKbsPinFragment__pins_add_an_extra_layer_of_security);
-
-  }
-
-  private void initializeViewStatesForNewPin() {
+  private void initializeViewStatesForPinUpdate() {
     getTitle().setText(R.string.CreateKbsPinFragment__create_a_new_pin);
     getDescription().setText(R.string.CreateKbsPinFragment__because_youre_still_logged_in);
   }
 
+  private void initializeViewStatesForPinCreate() {
+    getTitle().setText(R.string.CreateKbsPinFragment__create_your_pin);
+    getDescription().setText(R.string.CreateKbsPinFragment__pins_add_an_extra_layer_of_security);
+  }
+
   @Override
   protected CreateKbsPinViewModel initializeViewModel() {
     CreateKbsPinViewModel viewModel = ViewModelProviders.of(this).get(CreateKbsPinViewModel.class);