empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix crash after entering incorrect pin for registration lock.

Browse source
This commit is contained in:
Cody Henthorne 2023-02-23 12:19:58 -05:00
parent f3922c4156
commit 6ee04f6574
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
View file

@ -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 -> {
.<ServiceResponse<VerifyResponse>>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