Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-01 22:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to libsignal 0.47.0

Browse Source
This commit is contained in:
Greyson Parrelli
2024-05-22 09:21:56 -04:00
committed by Cody Henthorne
parent 99ae7c5961
commit 1296365bed
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt
View File

@@ -57,13 +57,13 @@ class SecureValueRecoveryV3(
return try {
val result = network.svr3().restore(normalizedPin, shareSet, enclaveAuth).get()
val masterKey = MasterKey(result)
val masterKey = MasterKey(result.value)
RestoreResponse.Success(masterKey, authorization)
} catch (e: ExecutionException) {
when (val cause = e.cause) {
is NetworkException -> RestoreResponse.NetworkError(IOException(cause)) // TODO [svr3] Update when we get to IOException
is NetworkException -> RestoreResponse.NetworkError(cause)
is DataMissingException -> RestoreResponse.Missing
is RestoreFailedException -> RestoreResponse.PinMismatch(1) // TODO [svr3] Get proper API for this
is RestoreFailedException -> RestoreResponse.PinMismatch(cause.triesRemaining)
is AttestationFailedException -> RestoreResponse.ApplicationError(cause)
is SgxCommunicationFailureException -> RestoreResponse.ApplicationError(cause)
is IOException -> RestoreResponse.NetworkError(cause)
@@ -126,7 +126,7 @@ class SecureValueRecoveryV3(
BackupResponse.Success(masterKey, rawAuth)
} catch (e: ExecutionException) {
when (val cause = e.cause) {
is NetworkException -> BackupResponse.NetworkError(IOException(cause)) // TODO [svr] Update when we move to IOException
is NetworkException -> BackupResponse.NetworkError(cause)
is AttestationFailedException -> BackupResponse.ApplicationError(cause)
is SgxCommunicationFailureException -> BackupResponse.ApplicationError(cause)
is IOException -> BackupResponse.NetworkError(cause)