Merge branch 'develop' into dependabot/github_actions/srvaroa/labeler…

…-1.13.0

logic/src/commonMain/kotlin/com/wire/kalium/logic/data/user/UserRepository.kt

@@ -23,6 +23,7 @@ import com.wire.kalium.logger.obfuscateDomain
 import com.wire.kalium.logic.CoreFailure
 import com.wire.kalium.logic.NetworkFailure
 import com.wire.kalium.logic.StorageFailure
+import com.wire.kalium.logic.data.conversation.ClientId
 import com.wire.kalium.logic.data.conversation.MemberMapper
 import com.wire.kalium.logic.data.conversation.Recipient
 import com.wire.kalium.logic.data.conversation.mls.NameAndHandle
@@ -167,6 +168,7 @@ interface UserRepository {
     suspend fun getNameAndHandle(userId: UserId): Either<StorageFailure, NameAndHandle>
     suspend fun migrateUserToTeam(teamName: String): Either<CoreFailure, CreateUserTeam>
     suspend fun updateTeamId(userId: UserId, teamId: TeamId): Either<StorageFailure, Unit>
+    suspend fun isClientMlsCapable(userId: UserId, clientId: ClientId): Either<StorageFailure, Boolean>
 }
 
 @Suppress("LongParameterList", "TooManyFunctions")
@@ -668,6 +670,10 @@ internal class UserDataSource internal constructor(
         userDAO.updateTeamId(userId.toDao(), teamId.value)
     }
 
+    override suspend fun isClientMlsCapable(userId: UserId, clientId: ClientId): Either<StorageFailure, Boolean> = wrapStorageRequest {
+        clientDAO.isMLSCapable(userId.toDao(), clientId.value)
+    }
+
     companion object {
         internal const val SELF_USER_ID_KEY = "selfUserID"
 

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/ConversationScope.kt

@@ -164,7 +164,12 @@ class ConversationScope internal constructor(
         get() = ObserveIsSelfUserMemberUseCaseImpl(conversationRepository, selfUserId)
 
     val observeConversationInteractionAvailabilityUseCase: ObserveConversationInteractionAvailabilityUseCase
-        get() = ObserveConversationInteractionAvailabilityUseCase(conversationRepository, userRepository)
+        get() = ObserveConversationInteractionAvailabilityUseCase(
+            conversationRepository,
+            selfUserId = selfUserId,
+            selfClientIdProvider = currentClientIdProvider,
+            userRepository = userRepository
+        )
 
     val deleteTeamConversation: DeleteTeamConversationUseCase
         get() = DeleteTeamConversationUseCaseImpl(selfTeamIdProvider, teamRepository, conversationRepository)

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationInteractionAvailabilityUseCase.kt

@@ -25,15 +25,18 @@ import com.wire.kalium.logic.data.conversation.ConversationRepository
 import com.wire.kalium.logic.data.conversation.InteractionAvailability
 import com.wire.kalium.logic.data.conversation.interactionAvailability
 import com.wire.kalium.logic.data.id.ConversationId
+import com.wire.kalium.logic.data.id.CurrentClientIdProvider
 import com.wire.kalium.logic.data.message.MessageContent
-import com.wire.kalium.logic.data.user.SelfUser
-import com.wire.kalium.logic.data.user.SupportedProtocol
+import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.data.user.UserRepository
+import com.wire.kalium.logic.functional.flatMap
 import com.wire.kalium.logic.functional.fold
+import com.wire.kalium.logic.functional.getOrElse
+import com.wire.kalium.logic.kaliumLogger
 import com.wire.kalium.util.KaliumDispatcher
 import com.wire.kalium.util.KaliumDispatcherImpl
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 
@@ -48,6 +51,8 @@ import kotlinx.coroutines.withContext
 class ObserveConversationInteractionAvailabilityUseCase internal constructor(
     private val conversationRepository: ConversationRepository,
     private val userRepository: UserRepository,
+    private val selfUserId: UserId,
+    private val selfClientIdProvider: CurrentClientIdProvider,
     private val dispatcher: KaliumDispatcher = KaliumDispatcherImpl,
 ) {
 
@@ -56,13 +61,21 @@ class ObserveConversationInteractionAvailabilityUseCase internal constructor(
      * @return an [IsInteractionAvailableResult] containing Success or Failure cases
      */
     suspend operator fun invoke(conversationId: ConversationId): Flow<IsInteractionAvailableResult> = withContext(dispatcher.io) {
-        conversationRepository.observeConversationDetailsById(conversationId).combine(
-            userRepository.observeSelfUser()
-        ) { conversation, selfUser ->
-            conversation to selfUser
-        }.map { (eitherConversation, selfUser) ->
+
+        val isSelfClientMlsCapable = selfClientIdProvider().flatMap {
+            userRepository.isClientMlsCapable(selfUserId, it)
+        }.getOrElse {
+            return@withContext flow { IsInteractionAvailableResult.Failure(it) }
+        }
+
+        kaliumLogger.withTextTag("ObserveConversationInteractionAvailabilityUseCase").d("isSelfClientMlsCapable $isSelfClientMlsCapable")
+
+        conversationRepository.observeConversationDetailsById(conversationId).map { eitherConversation ->
             eitherConversation.fold({ failure -> IsInteractionAvailableResult.Failure(failure) }, { conversationDetails ->
-                val isProtocolSupported = doesUserSupportConversationProtocol(conversationDetails, selfUser)
+                val isProtocolSupported = doesUserSupportConversationProtocol(
+                    conversationDetails = conversationDetails,
+                    isSelfClientMlsCapable = isSelfClientMlsCapable
+                )
                 if (!isProtocolSupported) { // short-circuit to Unsupported Protocol if it's the case
                     return@fold IsInteractionAvailableResult.Success(InteractionAvailability.UNSUPPORTED_PROTOCOL)
                 }
@@ -74,19 +87,12 @@ class ObserveConversationInteractionAvailabilityUseCase internal constructor(
 
     private fun doesUserSupportConversationProtocol(
         conversationDetails: ConversationDetails,
-        selfUser: SelfUser
-    ): Boolean {
-        val protocolInfo = conversationDetails.conversation.protocol
-        val acceptableProtocols = when (protocolInfo) {
-            is Conversation.ProtocolInfo.MLS -> setOf(SupportedProtocol.MLS)
-            // Messages in mixed conversations are sent through Proteus
-            is Conversation.ProtocolInfo.Mixed -> setOf(SupportedProtocol.PROTEUS)
-            Conversation.ProtocolInfo.Proteus -> setOf(SupportedProtocol.PROTEUS)
-        }
-        val isProtocolSupported = selfUser.supportedProtocols?.any { supported ->
-            acceptableProtocols.contains(supported)
-        } ?: false
-        return isProtocolSupported
+        isSelfClientMlsCapable: Boolean
+    ): Boolean = when (conversationDetails.conversation.protocol) {
+        is Conversation.ProtocolInfo.MLS -> isSelfClientMlsCapable
+        // Messages in mixed conversations are sent through Proteus
+        is Conversation.ProtocolInfo.Mixed,
+        Conversation.ProtocolInfo.Proteus -> true
     }
 }
 

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/protocol/OneOnOneProtocolSelector.kt

@@ -24,7 +24,8 @@ import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.data.user.UserRepository
 import com.wire.kalium.logic.functional.Either
 import com.wire.kalium.logic.functional.flatMap
-import com.wire.kalium.logic.functional.fold
+import com.wire.kalium.logic.functional.getOrNull
+import com.wire.kalium.logic.kaliumLogger
 
 internal interface OneOnOneProtocolSelector {
     suspend fun getProtocolForUser(userId: UserId): Either<CoreFailure, SupportedProtocol>
@@ -41,13 +42,17 @@ internal class OneOnOneProtocolSelectorImpl(
                 return@flatMap Either.Left(CoreFailure.Unknown(error))
             }
 
+            val teamDefaultProtocol = userConfigRepository.getDefaultProtocol().getOrNull()
             val selfUserProtocols = selfUser.supportedProtocols.orEmpty()
             val otherUserProtocols = otherUser.supportedProtocols.orEmpty()
-            val commonProtocols = userConfigRepository.getDefaultProtocol().fold({
-                selfUserProtocols.intersect(otherUserProtocols)
-            }, {
-                selfUserProtocols.intersect(listOf(it).toSet()).intersect(otherUserProtocols)
-            })
+            val commonProtocols = selfUserProtocols.intersect(otherUserProtocols)
+
+            kaliumLogger.withTextTag(TAG).d(
+                "teamDefaultProtocol = $teamDefaultProtocol, " +
+                        "selfUserProtocols = $selfUserProtocols, " +
+                        "otherUserProtocols = $otherUserProtocols, " +
+                        "commonProtocols = $commonProtocols"
+            )
 
             return when {
                 commonProtocols.contains(SupportedProtocol.MLS) -> Either.Right(SupportedProtocol.MLS)
@@ -56,4 +61,8 @@ internal class OneOnOneProtocolSelectorImpl(
                 else -> Either.Left(CoreFailure.NoCommonProtocolFound.SelfNeedToUpdate)
             }
         }
+
+    private companion object {
+        const val TAG = "OneOnOneProtocolSelector"
+    }
 }

logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationInteractionAvailabilityUseCaseTest.kt

@@ -20,16 +20,21 @@ package com.wire.kalium.logic.feature.conversation
 
 import app.cash.turbine.test
 import com.wire.kalium.logic.StorageFailure
+import com.wire.kalium.logic.data.conversation.ClientId
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.conversation.InteractionAvailability
 import com.wire.kalium.logic.data.user.ConnectionState
 import com.wire.kalium.logic.data.user.SupportedProtocol
+import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.framework.TestConversation
 import com.wire.kalium.logic.framework.TestConversationDetails
 import com.wire.kalium.logic.framework.TestUser
 import com.wire.kalium.logic.functional.Either
+import com.wire.kalium.logic.functional.right
 import com.wire.kalium.logic.test_util.TestKaliumDispatcher
 import com.wire.kalium.logic.test_util.testKaliumDispatcher
+import com.wire.kalium.logic.util.arrangement.provider.CurrentClientIdProviderArrangement
+import com.wire.kalium.logic.util.arrangement.provider.CurrentClientIdProviderArrangementImpl
 import com.wire.kalium.logic.util.arrangement.repository.ConversationRepositoryArrangement
 import com.wire.kalium.logic.util.arrangement.repository.ConversationRepositoryArrangementImpl
 import com.wire.kalium.logic.util.arrangement.repository.UserRepositoryArrangement
@@ -41,6 +46,7 @@ import io.mockative.once
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
+import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
@@ -52,6 +58,7 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
         val conversationId = TestConversation.ID
 
         val (arrangement, observeConversationInteractionAvailability) = arrange {
+            withIsClientMlsCapable(false.right())
             dispatcher = testKaliumDispatcher
             withSelfUserBeingMemberOfConversation(isMember = true)
         }
@@ -76,6 +83,7 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
         val (arrangement, observeConversationInteractionAvailability) = arrange {
             dispatcher = testKaliumDispatcher
             withSelfUserBeingMemberOfConversation(isMember = false)
+            withIsClientMlsCapable(false.right())
         }
 
         observeConversationInteractionAvailability(conversationId).test {
@@ -96,6 +104,7 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
         val conversationId = TestConversation.ID
 
         val (arrangement, observeConversationInteractionAvailability) = arrange {
+            withIsClientMlsCapable(false.right())
             dispatcher = testKaliumDispatcher
             withGroupConversationError()
         }
@@ -118,6 +127,7 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
         val conversationId = TestConversation.ID
 
         val (arrangement, observeConversationInteractionAvailability) = arrange {
+            withIsClientMlsCapable(false.right())
             dispatcher = testKaliumDispatcher
             withBlockedUserConversation()
         }
@@ -132,14 +142,14 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
 
             awaitComplete()
         }
-
     }
 
     @Test
     fun givenOtherUserIsDeleted_whenInvokingInteractionForConversation_thenInteractionShouldBeDisabled() = runTest {
         val conversationId = TestConversation.ID
 
         val (arrangement, observeConversationInteractionAvailability) = arrange {
+            withIsClientMlsCapable(false.right())
             dispatcher = testKaliumDispatcher
             withDeletedUserConversation()
         }
@@ -156,11 +166,12 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
         }
     }
 
+    @Ignore // is this really a case that a client does not support Proteus
     @Test
     fun givenProteusConversationAndUserSupportsOnlyMLS_whenObserving_thenShouldReturnUnsupportedProtocol() = runTest {
         testProtocolSupport(
             conversationProtocolInfo = Conversation.ProtocolInfo.Proteus,
-            userSupportedProtocols = setOf(SupportedProtocol.MLS),
+            isMlsCapable = true.right(),
             expectedResult = InteractionAvailability.UNSUPPORTED_PROTOCOL
         )
     }
@@ -169,7 +180,7 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
     fun givenMLSConversationAndUserSupportsOnlyMLS_whenObserving_thenShouldReturnUnsupportedProtocol() = runTest {
         testProtocolSupport(
             conversationProtocolInfo = TestConversation.MLS_PROTOCOL_INFO,
-            userSupportedProtocols = setOf(SupportedProtocol.PROTEUS),
+            isMlsCapable = false.right(),
             expectedResult = InteractionAvailability.UNSUPPORTED_PROTOCOL
         )
     }
@@ -178,7 +189,7 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
     fun givenMixedConversationAndUserSupportsOnlyMLS_whenObserving_thenShouldReturnUnsupportedProtocol() = runTest {
         testProtocolSupport(
             conversationProtocolInfo = TestConversation.MIXED_PROTOCOL_INFO,
-            userSupportedProtocols = setOf(SupportedProtocol.PROTEUS),
+            isMlsCapable = false.right(),
             expectedResult = InteractionAvailability.ENABLED
         )
     }
@@ -187,7 +198,7 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
     fun givenMixedConversationAndUserSupportsProteus_whenObserving_thenShouldReturnEnabled() = runTest {
         testProtocolSupport(
             conversationProtocolInfo = TestConversation.MIXED_PROTOCOL_INFO,
-            userSupportedProtocols = setOf(SupportedProtocol.PROTEUS),
+            isMlsCapable = false.right(),
             expectedResult = InteractionAvailability.ENABLED
         )
     }
@@ -196,35 +207,35 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
     fun givenMLSConversationAndUserSupportsMLS_whenObserving_thenShouldReturnEnabled() = runTest {
         testProtocolSupport(
             conversationProtocolInfo = TestConversation.MLS_PROTOCOL_INFO,
-            userSupportedProtocols = setOf(SupportedProtocol.MLS),
-            expectedResult = InteractionAvailability.ENABLED
+            expectedResult = InteractionAvailability.ENABLED,
+            isMlsCapable = true.right()
         )
     }
 
     @Test
     fun givenProteusConversationAndUserSupportsProteus_whenObserving_thenShouldReturnEnabled() = runTest {
         testProtocolSupport(
             conversationProtocolInfo = TestConversation.PROTEUS_PROTOCOL_INFO,
-            userSupportedProtocols = setOf(SupportedProtocol.PROTEUS),
-            expectedResult = InteractionAvailability.ENABLED
+            expectedResult = InteractionAvailability.ENABLED,
+            isMlsCapable = false.right()
         )
     }
 
     private suspend fun CoroutineScope.testProtocolSupport(
         conversationProtocolInfo: Conversation.ProtocolInfo,
-        userSupportedProtocols: Set<SupportedProtocol>,
+        isMlsCapable: Either<StorageFailure, Boolean>,
         expectedResult: InteractionAvailability
     ) {
         val convId = TestConversationDetails.CONVERSATION_GROUP.conversation.id
         val (_, observeConversationInteractionAvailabilityUseCase) = arrange {
+            withIsClientMlsCapable(isMlsCapable)
             dispatcher = testKaliumDispatcher
             val proteusGroupDetails = TestConversationDetails.CONVERSATION_GROUP.copy(
                 conversation = TestConversationDetails.CONVERSATION_GROUP.conversation.copy(
                     protocol = conversationProtocolInfo
                 )
             )
             withObserveConversationDetailsByIdReturning(Either.Right(proteusGroupDetails))
-            withObservingSelfUserReturning(flowOf(TestUser.SELF.copy(supportedProtocols = userSupportedProtocols)))
         }
 
         observeConversationInteractionAvailabilityUseCase(convId).test {
@@ -241,6 +252,7 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
         val (_, observeConversationInteractionAvailability) = arrange {
             dispatcher = testKaliumDispatcher
             withLegalHoldOneOnOneConversation(Conversation.LegalHoldStatus.ENABLED)
+            withIsClientMlsCapable(false.right())
         }
         observeConversationInteractionAvailability(conversationId).test {
             val interactionResult = awaitItem()
@@ -253,6 +265,7 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
     fun givenConversationLegalHoldIsDegraded_whenInvokingInteractionForConversation_thenInteractionShouldBeLegalHold() = runTest {
         val conversationId = TestConversation.ID
         val (_, observeConversationInteractionAvailability) = arrange {
+            withIsClientMlsCapable(false.right())
             dispatcher = testKaliumDispatcher
             withLegalHoldOneOnOneConversation(Conversation.LegalHoldStatus.DEGRADED)
         }
@@ -266,10 +279,12 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
     private class Arrangement(
         private val configure: suspend Arrangement.() -> Unit
     ) : UserRepositoryArrangement by UserRepositoryArrangementImpl(),
-        ConversationRepositoryArrangement by ConversationRepositoryArrangementImpl() {
+        ConversationRepositoryArrangement by ConversationRepositoryArrangementImpl(),
+        CurrentClientIdProviderArrangement by CurrentClientIdProviderArrangementImpl() {
 
         var dispatcher: KaliumDispatcher = TestKaliumDispatcher
 
+        val selfUser = UserId("self_value", "self_domain")
         suspend fun withSelfUserBeingMemberOfConversation(isMember: Boolean) = apply {
             withObserveConversationDetailsByIdReturning(
                 Either.Right(TestConversationDetails.CONVERSATION_GROUP.copy(isSelfUserMember = isMember))
@@ -315,17 +330,15 @@ class ObserveConversationInteractionAvailabilityUseCaseTest {
         }
 
         suspend fun arrange(): Pair<Arrangement, ObserveConversationInteractionAvailabilityUseCase> = run {
-            withObservingSelfUserReturning(
-                flowOf(
-                    TestUser.SELF.copy(supportedProtocols = setOf(SupportedProtocol.MLS, SupportedProtocol.PROTEUS))
-                )
-            )
+            withCurrentClientIdSuccess(ClientId("client_id"))
             configure()
             this@Arrangement to ObserveConversationInteractionAvailabilityUseCase(
                 conversationRepository = conversationRepository,
                 userRepository = userRepository,
-                dispatcher = dispatcher
-            )
+                dispatcher = dispatcher,
+                selfUserId = selfUser,
+                selfClientIdProvider = currentClientIdProvider
+                )
         }
     }