From c21d4861c0671230ed15029d004f581f29b919fe Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sun, 2 Feb 2020 23:36:41 -0500
Subject: [PATCH] Clear text entry after changing PIN types.

---
 .../thoughtcrime/securesms/lock/v2/CreateKbsPinFragment.java | 5 ++++-
 .../registration/fragments/RegistrationLockFragment.java     | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

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 a58fdcd9ec..d51ba5fd5f 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
@@ -39,8 +39,11 @@ public class CreateKbsPinFragment extends BaseKbsPinFragment<CreateKbsPinViewMod
   protected CreateKbsPinViewModel initializeViewModel() {
     CreateKbsPinViewModel viewModel = ViewModelProviders.of(this).get(CreateKbsPinViewModel.class);
 
-    viewModel.getKeyboard().observe(getViewLifecycleOwner(), k -> getLabel().setText(getLabelText(k)));
     viewModel.getNavigationEvents().observe(getViewLifecycleOwner(), e -> onConfirmPin(e.getUserEntry(), e.getKeyboard()));
+    viewModel.getKeyboard().observe(getViewLifecycleOwner(), k -> {
+      getLabel().setText(getLabelText(k));
+      getInput().getText().clear();
+    });
 
     return viewModel;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
index dc93fb123c..73fb7a8784 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
@@ -257,6 +257,8 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
 
     pinEntry.setInputType(isAlphaNumeric ? InputType.TYPE_CLASS_TEXT   | InputType.TYPE_TEXT_VARIATION_PASSWORD
                                          : InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
+
+    pinEntry.getText().clear();
   }
 
   private @StringRes static int resolveKeyboardToggleText(@NonNull PinKeyboardType keyboard) {