Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #5314 from uhoreg/separate_import_error

Browse source 
Fix error when attempting to verify with recovery key with missing backup key
This commit is contained in:
Benoit Marty 2025-10-09 12:02:56 +02:00 • committed by GitHub
commit a62ed35a62
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
View file

@ -44,6 +44,7 @@ import org.matrix.rustcomponents.sdk.Encryption
import org.matrix.rustcomponents.sdk.UserIdentity import org.matrix.rustcomponents.sdk.UserIdentity
import org.matrix.rustcomponents.sdk.BackupUploadState as RustBackupUploadState import org.matrix.rustcomponents.sdk.BackupUploadState as RustBackupUploadState
import org.matrix.rustcomponents.sdk.EnableRecoveryProgress as RustEnableRecoveryProgress import org.matrix.rustcomponents.sdk.EnableRecoveryProgress as RustEnableRecoveryProgress
import org.matrix.rustcomponents.sdk.RecoveryException as RustRecoveryException
import org.matrix.rustcomponents.sdk.SteadyStateException as RustSteadyStateException import org.matrix.rustcomponents.sdk.SteadyStateException as RustSteadyStateException
class RustEncryptionService( class RustEncryptionService(
@ -205,8 +206,13 @@ class RustEncryptionService(
override suspend fun recover(recoveryKey: String): Result<Unit> = withContext(dispatchers.io) { override suspend fun recover(recoveryKey: String): Result<Unit> = withContext(dispatchers.io) {
runCatchingExceptions { runCatchingExceptions {
service.recover(recoveryKey) service.recover(recoveryKey)
}.mapFailure { }.recoverCatching {
it.mapRecoveryException() if (it is RustRecoveryException.Import) {
// We ignore import errors because the user will be notified about them via the "Key storage out of sync" detection.
Unit
} else {
throw it.mapRecoveryException()
}
} }
} }