From 6ee04f6574dc7211a1ac4e0917cda5385a3da095 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Thu, 23 Feb 2023 12:19:58 -0500 Subject: [PATCH] Fix crash after entering incorrect pin for registration lock. --- .../registration/viewmodel/RegistrationViewModel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 f4e92a3cd..866b6b83f 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 @@ -179,7 +179,8 @@ public final class RegistrationViewModel extends BaseRegistrationViewModel { } else { return Single.just(verifyAccountWithoutKbsResponse); } - }); + }) + .onErrorReturn(ServiceResponse::forUnknownError); } @Override @@ -196,13 +197,14 @@ public final class RegistrationViewModel extends BaseRegistrationViewModel { setCanCallAtTime(processor.getNextCodeViaCallAttempt()); } }) - .flatMap(processor -> { + .>flatMap(processor -> { if (processor.isAlreadyVerified() || (processor.hasResult() && processor.isVerified())) { return verifyAccountRepository.registerAccount(sessionId, getRegistrationData(), pin, () -> Objects.requireNonNull(KbsRepository.restoreMasterKey(pin, kbsTokenData.getEnclave(), kbsTokenData.getBasicAuth(), kbsTokenData.getTokenResponse()))); } else { return Single.just(ServiceResponse.coerceError(processor.getResponse())); } - }); + }) + .onErrorReturn(ServiceResponse::forUnknownError); } @Override