From 6c01807f4f02774912047a587027750d66c7ce01 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 30 Apr 2020 17:03:12 -0400
Subject: [PATCH] Fix issue with PIN verification.

---
 .../thoughtcrime/securesms/lock/SignalPinReminderDialog.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java b/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
index 7c2561e030..56c3c7577c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
@@ -99,9 +99,8 @@ public final class SignalPinReminderDialog {
     reminder.setMovementMethod(LinkMovementMethod.getInstance());
 
     PinVerifier.Callback callback = getPinWatcherCallback(context, dialog, pinEditText, pinStatus, mainCallback);
-    PinVerifier          verifier = SignalStore.kbsValues().isV2RegistrationLockEnabled()
-                                    ? new V2PinVerifier()
-                                    : new V1PinVerifier(context);
+    PinVerifier          verifier = SignalStore.kbsValues().hasPin() ? new V2PinVerifier()
+                                                                     : new V1PinVerifier(context);
 
     skip.setOnClickListener(v -> {
       dialog.dismiss();