mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix crash after entering incorrect pin for registration lock.

main
Cody Henthorne 2023-02-23 12:19:58 -05:00
rodzic f3922c4156
commit 6ee04f6574
1 zmienionych plików z 5 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
Wyświetl plik

@ -179,7 +179,8 @@ public final class RegistrationViewModel extends BaseRegistrationViewModel {
} else { } else {
return Single.just(verifyAccountWithoutKbsResponse); return Single.just(verifyAccountWithoutKbsResponse);
} }
}); })
.onErrorReturn(ServiceResponse::forUnknownError);
} }
@Override @Override
@ -196,13 +197,14 @@ public final class RegistrationViewModel extends BaseRegistrationViewModel {
setCanCallAtTime(processor.getNextCodeViaCallAttempt()); setCanCallAtTime(processor.getNextCodeViaCallAttempt());
} }
}) })
.flatMap(processor -> { .<ServiceResponse<VerifyResponse>>flatMap(processor -> {
if (processor.isAlreadyVerified() || (processor.hasResult() && processor.isVerified())) { if (processor.isAlreadyVerified() || (processor.hasResult() && processor.isVerified())) {
return verifyAccountRepository.registerAccount(sessionId, getRegistrationData(), pin, () -> Objects.requireNonNull(KbsRepository.restoreMasterKey(pin, kbsTokenData.getEnclave(), kbsTokenData.getBasicAuth(), kbsTokenData.getTokenResponse()))); return verifyAccountRepository.registerAccount(sessionId, getRegistrationData(), pin, () -> Objects.requireNonNull(KbsRepository.restoreMasterKey(pin, kbsTokenData.getEnclave(), kbsTokenData.getBasicAuth(), kbsTokenData.getTokenResponse())));
} else { } else {
return Single.just(ServiceResponse.coerceError(processor.getResponse())); return Single.just(ServiceResponse.coerceError(processor.getResponse()));
} }
}); })
.onErrorReturn(ServiceResponse::forUnknownError);
} }
@Override @Override