Merge branch 'develop' into Migration-message-not-shown-in-11-convers…

…ations

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 {

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

logic/src/commonMain/kotlin/com/wire/kalium/logic/configuration/UserConfigRepository.kt

@@ -136,8 +136,6 @@ interface UserConfigRepository {
     suspend fun setShouldNotifyForRevokedCertificate(shouldNotify: Boolean)
     suspend fun observeShouldNotifyForRevokedCertificate(): Flow<Either<StorageFailure, Boolean>>
     suspend fun clearE2EISettings()
-    fun setShouldFetchE2EITrustAnchors(shouldFetch: Boolean)
-    fun getShouldFetchE2EITrustAnchor(): Boolean
     suspend fun setCurrentTrackingIdentifier(newIdentifier: String)
     suspend fun getCurrentTrackingIdentifier(): String?
     suspend fun observeCurrentTrackingIdentifier(): Flow<Either<StorageFailure, String>>
@@ -146,6 +144,8 @@ interface UserConfigRepository {
     suspend fun deletePreviousTrackingIdentifier()
     suspend fun updateNextTimeForCallFeedback(valueMs: Long)
     suspend fun getNextTimeForCallFeedback(): Either<StorageFailure, Long>
+    suspend fun setShouldFetchE2EITrustAnchors(shouldFetch: Boolean)
+    suspend fun getShouldFetchE2EITrustAnchor(): Boolean
 }
 
 @Suppress("TooManyFunctions")
@@ -508,12 +508,10 @@ internal class UserConfigDataSource internal constructor(
     override suspend fun observeShouldNotifyForRevokedCertificate(): Flow<Either<StorageFailure, Boolean>> =
         userConfigDAO.observeShouldNotifyForRevokedCertificate().wrapStorageRequest()
 
-    override fun setShouldFetchE2EITrustAnchors(shouldFetch: Boolean) {
-        userConfigStorage.setShouldFetchE2EITrustAnchors(shouldFetch = shouldFetch)
+    override suspend fun setShouldFetchE2EITrustAnchors(shouldFetch: Boolean) {
+        userConfigDAO.setShouldFetchE2EITrustAnchors(shouldFetch = shouldFetch)
     }
 
-    override fun getShouldFetchE2EITrustAnchor(): Boolean = userConfigStorage.getShouldFetchE2EITrustAnchorHasRun()
-
     override suspend fun setCurrentTrackingIdentifier(newIdentifier: String) {
         wrapStorageRequest {
             userConfigDAO.setTrackingIdentifier(identifier = newIdentifier)
@@ -547,4 +545,5 @@ internal class UserConfigDataSource internal constructor(
 
     override suspend fun getNextTimeForCallFeedback() = wrapStorageRequest { userConfigDAO.getNextTimeForCallFeedback() }
 
+    override suspend fun getShouldFetchE2EITrustAnchor(): Boolean = userConfigDAO.getShouldFetchE2EITrustAnchorHasRun()
 }

logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/MLSClientProvider.kt

@@ -141,9 +141,12 @@ class MLSClientProviderImpl(
 
     override suspend fun clearLocalFiles() {
         mlsClientMutex.withLock {
-            mlsClient?.close()
-            mlsClient = null
-            FileUtil.deleteDirectory(rootKeyStorePath)
+            coreCryptoCentralMutex.withLock {
+                mlsClient?.close()
+                mlsClient = null
+                coreCryptoCentral = null
+                FileUtil.deleteDirectory(rootKeyStorePath)
+            }
         }
     }
 
@@ -182,7 +185,10 @@ class MLSClientProviderImpl(
         }
     }
 
-    private suspend fun mlsClient(userId: CryptoUserID, clientId: ClientId): Either<CoreFailure, MLSClient> {
+    private suspend fun mlsClient(
+        userId: CryptoUserID,
+        clientId: ClientId
+    ): Either<CoreFailure, MLSClient> {
         return getCoreCrypto(clientId).flatMap { cc ->
             getOrFetchMLSConfig().map { (supportedCipherSuite, defaultCipherSuite) ->
                 cc.mlsClient(

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/GetOrRegisterClientUseCase.kt

@@ -55,7 +55,7 @@ internal class GetOrRegisterClientUseCaseImpl(
 ) : GetOrRegisterClientUseCase {
 
     override suspend fun invoke(registerClientParam: RegisterClientUseCase.RegisterClientParam): RegisterClientResult {
-        syncFeatureConfigsUseCase.invoke()
+        syncFeatureConfigsUseCase()
 
         val result: RegisterClientResult = clientRepository.retainedClientId()
             .nullableFold(

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/RegisterClientUseCase.kt

@@ -144,7 +144,7 @@ class RegisterClientUseCaseImpl @OptIn(DelicateKaliumApi::class) internal constr
                     model,
                     cookieLabel,
                     verificationCode,
-                    modelPostfix
+                    modelPostfix,
                 )
             }.fold({
                 RegisterClientResult.Failure.Generic(it)

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
         }
     }

logic/src/commonTest/kotlin/com/wire/kalium/logic/data/e2ei/E2EIRepositoryTest.kt

@@ -914,7 +914,7 @@ class E2EIRepositoryTest {
             arrangement.coreCryptoCentral.registerTrustAnchors(eq(Arrangement.RANDOM_BYTE_ARRAY.decodeToString()))
         }.wasInvoked(once)
 
-        verify {
+        coVerify {
             arrangement.userConfigRepository.setShouldFetchE2EITrustAnchors(eq(false))
         }.wasInvoked(once)
     }
@@ -933,7 +933,7 @@ class E2EIRepositoryTest {
         // then
         result.shouldSucceed()
 
-        verify {
+        coVerify {
             arrangement.userConfigRepository.getShouldFetchE2EITrustAnchor()
         }.wasInvoked(once)
     }
@@ -1099,18 +1099,19 @@ class E2EIRepositoryTest {
             }.returns(result)
         }
 
-        fun withGetShouldFetchE2EITrustAnchors(result: Boolean) = apply {
-            every {
+        suspend fun withGetShouldFetchE2EITrustAnchors(result: Boolean) = apply {
+            coEvery {
                 userConfigRepository.getShouldFetchE2EITrustAnchor()
             }.returns(result)
         }
 
-        fun withSetShouldFetchE2EIGetTrustAnchors() = apply {
-            every {
+        suspend fun withSetShouldFetchE2EIGetTrustAnchors() = apply {
+            coEvery {
                 userConfigRepository.setShouldFetchE2EITrustAnchors(any())
             }.returns(Unit)
         }
 
+
         suspend fun withAcmeDirectoriesApiSucceed() = apply {
             coEvery {
                 acmeApi.getACMEDirectories(any())

persistence/src/commonMain/kotlin/com/wire/kalium/persistence/config/UserConfigStorage.kt

@@ -178,8 +178,6 @@ interface UserConfigStorage {
     fun getE2EINotificationTime(): Long?
     fun e2EINotificationTimeFlow(): Flow<Long?>
     fun updateE2EINotificationTime(timeStamp: Long)
-    fun setShouldFetchE2EITrustAnchors(shouldFetch: Boolean)
-    fun getShouldFetchE2EITrustAnchorHasRun(): Boolean
 }
 
 @Serializable
@@ -576,13 +574,6 @@ class UserConfigStorageImpl(
         }
     }
 
-    override fun setShouldFetchE2EITrustAnchors(shouldFetch: Boolean) {
-        kaliumPreferences.putBoolean(SHOULD_FETCH_E2EI_GET_TRUST_ANCHORS, shouldFetch)
-    }
-
-    override fun getShouldFetchE2EITrustAnchorHasRun(): Boolean =
-        kaliumPreferences.getBoolean(SHOULD_FETCH_E2EI_GET_TRUST_ANCHORS, true)
-
     private companion object {
         const val FILE_SHARING = "file_sharing"
         const val GUEST_ROOM_LINK = "guest_room_link"
@@ -601,6 +592,5 @@ class UserConfigStorageImpl(
         const val ENABLE_TYPING_INDICATOR = "enable_typing_indicator"
         const val APP_LOCK = "app_lock"
         const val DEFAULT_PROTOCOL = "default_protocol"
-        const val SHOULD_FETCH_E2EI_GET_TRUST_ANCHORS = "should_fetch_e2ei_trust_anchors"
     }
 }

persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/unread/UserConfigDAO.kt

@@ -68,6 +68,8 @@ interface UserConfigDAO {
     suspend fun deletePreviousTrackingIdentifier()
     suspend fun getNextTimeForCallFeedback(): Long?
     suspend fun setNextTimeForCallFeedback(timestamp: Long)
+    suspend fun setShouldFetchE2EITrustAnchors(shouldFetch: Boolean)
+    suspend fun getShouldFetchE2EITrustAnchorHasRun(): Boolean
 }
 
 @Suppress("TooManyFunctions")
@@ -226,6 +228,13 @@ internal class UserConfigDAOImpl internal constructor(
     override suspend fun setNextTimeForCallFeedback(timestamp: Long) =
         metadataDAO.insertValue(timestamp.toString(), NEXT_TIME_TO_ASK_CALL_FEEDBACK)
 
+    override suspend fun setShouldFetchE2EITrustAnchors(shouldFetch: Boolean) {
+        metadataDAO.insertValue(value = shouldFetch.toString(), key = SHOULD_FETCH_E2EI_GET_TRUST_ANCHORS)
+    }
+
+    override suspend fun getShouldFetchE2EITrustAnchorHasRun(): Boolean =
+        metadataDAO.valueByKey(SHOULD_FETCH_E2EI_GET_TRUST_ANCHORS)?.toBoolean() ?: true
+
     private companion object {
         private const val DEFAULT_CIPHER_SUITE_KEY = "DEFAULT_CIPHER_SUITE"
         private const val SELF_DELETING_MESSAGES_KEY = "SELF_DELETING_MESSAGES"
@@ -239,5 +248,6 @@ internal class UserConfigDAOImpl internal constructor(
             "should_update_client_legal_hold_capability"
         private const val ANALYTICS_TRACKING_IDENTIFIER_PREVIOUS_KEY = "analytics_tracking_identifier_previous"
         private const val ANALYTICS_TRACKING_IDENTIFIER_KEY = "analytics_tracking_identifier"
+        const val SHOULD_FETCH_E2EI_GET_TRUST_ANCHORS = "should_fetch_e2ei_trust_anchors"
     }
 }

persistence/src/commonTest/kotlin/com/wire/kalium/persistence/config/UserConfigDAOTest.kt

@@ -123,4 +123,21 @@ class UserConfigDAOTest : BaseDatabaseTest() {
             assertEquals(thirdExpectedValue, thirdValue)
         }
     }
+
+    @Test
+    fun givenNoValueStoredForShouldFetchE2EITrustAnchorHasRun_whenCalled_thenReturnTrue() = runTest {
+        assertTrue(userConfigDAO.getShouldFetchE2EITrustAnchorHasRun())
+    }
+
+    @Test
+    fun givenShouldFetchE2EITrustAnchorHasRunIsSetToFalse_whenCalled_thenReturnFalse() = runTest {
+        userConfigDAO.setShouldFetchE2EITrustAnchors(false)
+        assertFalse(userConfigDAO.getShouldFetchE2EITrustAnchorHasRun())
+    }
+
+    @Test
+    fun givenShouldFetchE2EITrustAnchorHasRunIsSetToTrue_whenCalled_thenReturnTrue() = runTest {
+        userConfigDAO.setShouldFetchE2EITrustAnchors(true)
+        assertTrue(userConfigDAO.getShouldFetchE2EITrustAnchorHasRun())
+    }
 }