merge conflicts

wireapp · Feb 20, 2025 · 91f6dbf · 91f6dbf
1 parent a2aa4ca
commit 91f6dbf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepository.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepository.kt
@@ -54,12 +54,9 @@ import com.wire.kalium.common.error.wrapApiRequest
 import com.wire.kalium.common.error.wrapStorageRequest
 import com.wire.kalium.network.api.authenticated.connection.ConnectionDTO
 import com.wire.kalium.network.api.authenticated.connection.ConnectionStateDTO
-<<<<<<< HEAD
 import com.wire.kalium.network.api.base.authenticated.connection.ConnectionApi
-=======
 import com.wire.kalium.network.exceptions.KaliumException
 import com.wire.kalium.network.exceptions.isBadConnectionStatusUpdate
->>>>>>> 7baa25acf4 (fix: recover when getting error for updating connection status [WPB-16146] (#3297))
 import com.wire.kalium.persistence.dao.ConnectionDAO
 import com.wire.kalium.persistence.dao.ConnectionEntity
 import com.wire.kalium.persistence.dao.UserDAO
@@ -146,7 +143,7 @@ internal class ConnectionDataSource(
         }.onFailure { networkFailure ->
             if (networkFailure is NetworkFailure.ServerMiscommunication &&
                 networkFailure.kaliumException is KaliumException.InvalidRequestError &&
-                networkFailure.kaliumException.isBadConnectionStatusUpdate()
+                (networkFailure.kaliumException as KaliumException.InvalidRequestError).isBadConnectionStatusUpdate()
             ) {
                 kaliumLogger.e(
                     "Failed to update connection status for ${userId.toLogString()}" +

diff --git a/...c/src/commonTest/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepositoryTest.kt b/...c/src/commonTest/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepositoryTest.kt
@@ -31,12 +31,7 @@ import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.framework.TestConnection
 import com.wire.kalium.logic.framework.TestConversation
 import com.wire.kalium.logic.framework.TestUser
-<<<<<<< HEAD
 import com.wire.kalium.common.functional.Either
-=======
-import com.wire.kalium.logic.functional.Either
-import com.wire.kalium.logic.kaliumLogger
->>>>>>> 7baa25acf4 (fix: recover when getting error for updating connection status [WPB-16146] (#3297))
 import com.wire.kalium.logic.util.arrangement.dao.MemberDAOArrangement
 import com.wire.kalium.logic.util.arrangement.dao.MemberDAOArrangementImpl
 import com.wire.kalium.logic.util.shouldFail