From c7c973b55b65e5b9d493365b755c2ef80b63eb04 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:05:23 +0000 Subject: [PATCH] fix: Ignore MLSException (#3022) (#3025) Co-authored-by: Oussama Hassine Co-authored-by: Mohamad Jaara --- .../kotlin/com/wire/kalium/logic/CoreCryptoExceptionMapper.kt | 1 + logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreFailure.kt | 1 + .../receiver/conversation/message/MLSMessageFailureHandler.kt | 1 + 3 files changed, 3 insertions(+) diff --git a/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/CoreCryptoExceptionMapper.kt b/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/CoreCryptoExceptionMapper.kt index d4ba1b1e45e..a41535a1dc3 100644 --- a/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/CoreCryptoExceptionMapper.kt +++ b/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/CoreCryptoExceptionMapper.kt @@ -32,6 +32,7 @@ actual fun mapMLSException(exception: Exception): MLSFailure = is CryptoError.StaleCommit -> MLSFailure.StaleCommit is CryptoError.ConversationAlreadyExists -> MLSFailure.ConversationAlreadyExists is CryptoError.MessageEpochTooOld -> MLSFailure.MessageEpochTooOld + is CryptoError.MlsException -> MLSFailure.InternalErrors else -> MLSFailure.Generic(exception) } } else { diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreFailure.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreFailure.kt index 6ce16825226..de8f5c1df33 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreFailure.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreFailure.kt @@ -208,6 +208,7 @@ interface MLSFailure : CoreFailure { data object ConversationDoesNotSupportMLS : MLSFailure data object StaleProposal : MLSFailure data object StaleCommit : MLSFailure + data object InternalErrors : MLSFailure data class Generic(internal val exception: Exception) : MLSFailure { val rootCause: Throwable get() = exception diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/MLSMessageFailureHandler.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/MLSMessageFailureHandler.kt index e9646942f4d..88f29b61b65 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/MLSMessageFailureHandler.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/MLSMessageFailureHandler.kt @@ -42,6 +42,7 @@ internal object MLSMessageFailureHandler { is MLSFailure.StaleProposal -> MLSMessageFailureResolution.Ignore is MLSFailure.StaleCommit -> MLSMessageFailureResolution.Ignore is MLSFailure.MessageEpochTooOld -> MLSMessageFailureResolution.Ignore + is MLSFailure.InternalErrors -> MLSMessageFailureResolution.Ignore else -> MLSMessageFailureResolution.InformUser } }