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

Ignore errors from importing secrets from secret storage

Browse source
This commit is contained in:
Hubert Chathi 2025-09-09 13:12:05 -04:00
parent 59a8aaebff
commit c3c5f80cac
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/RecoveryException.kt
View file

@ -10,6 +10,7 @@ package io.element.android.libraries.matrix.api.encryption
import io.element.android.libraries.matrix.api.exception.ClientException import io.element.android.libraries.matrix.api.exception.ClientException
sealed class RecoveryException(message: String) : Exception(message) { sealed class RecoveryException(message: String) : Exception(message) {
class Import(message: String) : RecoveryException(message)
class SecretStorage(message: String) : RecoveryException(message) class SecretStorage(message: String) : RecoveryException(message)
data object BackupExistsOnServer : RecoveryException("BackupExistsOnServer") data object BackupExistsOnServer : RecoveryException("BackupExistsOnServer")
data class Client(val exception: ClientException) : RecoveryException(exception.message ?: "Unknown error") data class Client(val exception: ClientException) : RecoveryException(exception.message ?: "Unknown error")

3
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryExceptionMapper.kt
View file

@ -19,6 +19,9 @@ fun Throwable.mapRecoveryException(): RecoveryException {
is RustRecoveryException.SecretStorage -> RecoveryException.SecretStorage( is RustRecoveryException.SecretStorage -> RecoveryException.SecretStorage(
message = errorMessage message = errorMessage
) )
is RustRecoveryException.Import -> RecoveryException.Import(
message = errorMessage
)
is RustRecoveryException.BackupExistsOnServer -> RecoveryException.BackupExistsOnServer is RustRecoveryException.BackupExistsOnServer -> RecoveryException.BackupExistsOnServer
is RustRecoveryException.Client -> RecoveryException.Client( is RustRecoveryException.Client -> RecoveryException.Client(
source.mapClientException() source.mapClientException()

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.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.SteadyStateException as RustSteadyStateException import org.matrix.rustcomponents.sdk.SteadyStateException as RustSteadyStateException
import org.matrix.rustcomponents.sdk.RecoveryException as RustRecoveryException
internal class RustEncryptionService( internal class RustEncryptionService(
client: Client, client: Client,
@ -182,8 +183,13 @@ internal 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()
}
} }
} }