From 3e69ef8accfd72a3b0b5a5ea86f3b5cdef813aa8 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 24 Feb 2023 11:24:34 -0500 Subject: [PATCH] Attempt to auto-resolve after being locked out if local data is available. --- .../securesms/registration/viewmodel/RegistrationViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java index 866b6b83f1..9b3f4a7d18 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java @@ -165,7 +165,7 @@ public final class RegistrationViewModel extends BaseRegistrationViewModel { VerifyResponseProcessor processor = new VerifyResponseWithoutKbs(verifyAccountWithoutKbsResponse); String pin = SignalStore.kbsValues().getPin(); - if (processor.registrationLock() && SignalStore.kbsValues().getRegistrationLockToken() != null && pin != null) { + if ((processor.isKbsLocked() || processor.registrationLock()) && SignalStore.kbsValues().getRegistrationLockToken() != null && pin != null) { KbsPinData pinData = new KbsPinData(SignalStore.kbsValues().getOrCreateMasterKey(), SignalStore.kbsValues().getRegistrationLockTokenResponse()); return verifyAccountRepository.registerAccount(sessionId, getRegistrationData(), pin, () -> pinData)