From e22569b4f3f2cc673497837bd8673cb6399d32db Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 07:17:47 +0000
Subject: [PATCH 1/2] Commit with unresolved merge conflicts

---
 .../kalium/cryptography/ProteusClientTest.kt  |  2 +-
 gradle/libs.versions.toml                     |  4 +++
 .../kalium/logic/CoreCryptoExceptionMapper.kt | 30 +++++++++----------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/cryptography/src/commonTest/kotlin/com/wire/kalium/cryptography/ProteusClientTest.kt b/cryptography/src/commonTest/kotlin/com/wire/kalium/cryptography/ProteusClientTest.kt
index 4260020978a..b4208b37da9 100644
--- a/cryptography/src/commonTest/kotlin/com/wire/kalium/cryptography/ProteusClientTest.kt
+++ b/cryptography/src/commonTest/kotlin/com/wire/kalium/cryptography/ProteusClientTest.kt
@@ -39,7 +39,7 @@ class ProteusClientTest : BaseProteusClientTest() {
     private val alice = SampleUser(CryptoUserID("aliceId", "aliceDomain"), "Alice")
     private val bob = SampleUser(CryptoUserID("bobId", "bobDomain"), "Bob")
     private val aliceSessionId = CryptoSessionId(alice.id, CryptoClientId("aliceClient"))
-    private val bobSessionId = CryptoSessionId(alice.id, CryptoClientId("aliceClient"))
+    private val bobSessionId = CryptoSessionId(bob.id, CryptoClientId("bobClient"))
 
     @BeforeTest
     fun before() {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f8d462c7a8a..199d5650bee 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,7 +38,11 @@ pbandk = "0.14.2"
 turbine = "1.1.0"
 avs = "9.7.15"
 jna = "5.14.0"
+<<<<<<< HEAD
 core-crypto = "1.0.0-rc.55"
+=======
+core-crypto = "1.0.0-rc.56-hotfix.2"
+>>>>>>> 14e29438a6 (chore: update CC to rc.56.hotfix.2 [WPB-8592] 🍒 (#2743))
 core-crypto-multiplatform = "0.6.0-rc.3-multiplatform-pre1"
 completeKotlin = "1.1.0"
 desugar-jdk = "2.0.4"
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 c67d4c181f0..d4ba1b1e45e 100644
--- a/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/CoreCryptoExceptionMapper.kt
+++ b/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/CoreCryptoExceptionMapper.kt
@@ -21,19 +21,19 @@ import com.wire.crypto.CoreCryptoException
 import uniffi.core_crypto.CryptoError
 
 actual fun mapMLSException(exception: Exception): MLSFailure =
-        if (exception is CoreCryptoException.CryptoException) {
-            when (exception.error) {
-                is CryptoError.WrongEpoch -> MLSFailure.WrongEpoch
-                is CryptoError.DuplicateMessage -> MLSFailure.DuplicateMessage
-                is CryptoError.BufferedFutureMessage -> MLSFailure.BufferedFutureMessage
-                is CryptoError.SelfCommitIgnored -> MLSFailure.SelfCommitIgnored
-                is CryptoError.UnmergedPendingGroup -> MLSFailure.UnmergedPendingGroup
-                is CryptoError.StaleProposal -> MLSFailure.StaleProposal
-                is CryptoError.StaleCommit -> MLSFailure.StaleCommit
-                is CryptoError.ConversationAlreadyExists -> MLSFailure.ConversationAlreadyExists
-                is CryptoError.MessageEpochTooOld -> MLSFailure.MessageEpochTooOld
-                else -> MLSFailure.Generic(exception)
-            }
-        } else {
-            MLSFailure.Generic(exception)
+    if (exception is CoreCryptoException.CryptoException) {
+        when (exception.error) {
+            is CryptoError.WrongEpoch -> MLSFailure.WrongEpoch
+            is CryptoError.DuplicateMessage -> MLSFailure.DuplicateMessage
+            is CryptoError.BufferedFutureMessage -> MLSFailure.BufferedFutureMessage
+            is CryptoError.SelfCommitIgnored -> MLSFailure.SelfCommitIgnored
+            is CryptoError.UnmergedPendingGroup -> MLSFailure.UnmergedPendingGroup
+            is CryptoError.StaleProposal -> MLSFailure.StaleProposal
+            is CryptoError.StaleCommit -> MLSFailure.StaleCommit
+            is CryptoError.ConversationAlreadyExists -> MLSFailure.ConversationAlreadyExists
+            is CryptoError.MessageEpochTooOld -> MLSFailure.MessageEpochTooOld
+            else -> MLSFailure.Generic(exception)
         }
+    } else {
+        MLSFailure.Generic(exception)
+    }

From 560fff7dc773b613633ccd7a7868ebe377322ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Saleniuk?= <saleniuk@gmail.com>
Date: Wed, 29 May 2024 12:59:15 +0200
Subject: [PATCH 2/2] resolved conflict

---
 gradle/libs.versions.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 199d5650bee..583d17e4d9a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,11 +38,7 @@ pbandk = "0.14.2"
 turbine = "1.1.0"
 avs = "9.7.15"
 jna = "5.14.0"
-<<<<<<< HEAD
-core-crypto = "1.0.0-rc.55"
-=======
 core-crypto = "1.0.0-rc.56-hotfix.2"
->>>>>>> 14e29438a6 (chore: update CC to rc.56.hotfix.2 [WPB-8592] 🍒 (#2743))
 core-crypto-multiplatform = "0.6.0-rc.3-multiplatform-pre1"
 completeKotlin = "1.1.0"
 desugar-jdk = "2.0.4"