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

Ensure mapping of Rust exceptions cover all cases.

Browse source
This commit is contained in:
Benoit Marty 2024-09-12 13:05:45 +02:00 • committed by Benoit Marty
parent f028e902db
commit e5fdfc366b
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,13 +14,17 @@ import org.matrix.rustcomponents.sdk.RecoveryException as RustRecoveryException
fun Throwable.mapRecoveryException(): RecoveryException { fun Throwable.mapRecoveryException(): RecoveryException {
return when (this) { return when (this) {
is RustRecoveryException.SecretStorage -> RecoveryException.SecretStorage( is RustRecoveryException -> {
message = errorMessage when (this) {
) is RustRecoveryException.SecretStorage -> RecoveryException.SecretStorage(
is RustRecoveryException.BackupExistsOnServer -> RecoveryException.BackupExistsOnServer message = errorMessage
is RustRecoveryException.Client -> RecoveryException.Client( )
source.mapClientException() is RustRecoveryException.BackupExistsOnServer -> RecoveryException.BackupExistsOnServer
) is RustRecoveryException.Client -> RecoveryException.Client(
source.mapClientException()
)
}
}
else -> RecoveryException.Client( else -> RecoveryException.Client(
ClientException.Other("Unknown error") ClientException.Other("Unknown error")
) )

6
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ClientException.kt
View file

@ -12,7 +12,11 @@ import org.matrix.rustcomponents.sdk.ClientException as RustClientException
fun Throwable.mapClientException(): ClientException { fun Throwable.mapClientException(): ClientException {
return when (this) { return when (this) {
is RustClientException.Generic -> ClientException.Generic(msg) is RustClientException -> {
when (this) {
is RustClientException.Generic -> ClientException.Generic(msg)
}
}
else -> ClientException.Other(message ?: "Unknown error") else -> ClientException.Other(message ?: "Unknown error")
} }
} }