From f2dc2819ad5b7c89e71432315c351b1e61a722e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 09:19:21 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20random=20decryption=20errors=20after=20e?= =?UTF-8?q?nding=201:1=20on=20SFT=20(WPB-11213)=20=F0=9F=8D=92=20?= =?UTF-8?q?=F0=9F=8D=92=20(#3039)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Ignore MLSException (#3022) (#3025) Co-authored-by: Oussama Hassine Co-authored-by: Mohamad Jaara * chore: empty commit --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> 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 d6adca0a39f..4ac76d5ae6b 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 } }