Merge branch 'release/candidate' into revert-2962-fix/pick-oneonone-m…

…igration-target-alphabetically-cherry-pick
wireapp · Sep 17, 2024 · 363ae97 · 363ae97
2 parents 141122f + 6037016
commit 363ae97
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 237 deletions.
diff --git a/.../src/androidInstrumentedTest/kotlin/com/wire/kalium/logic/feature/call/CallManagerTest.kt b/.../src/androidInstrumentedTest/kotlin/com/wire/kalium/logic/feature/call/CallManagerTest.kt
@@ -27,7 +27,6 @@ import com.wire.kalium.logic.data.call.VideoStateChecker
 import com.wire.kalium.logic.data.call.mapper.CallMapperImpl
 import com.wire.kalium.logic.data.conversation.ClientId
 import com.wire.kalium.logic.data.conversation.ConversationRepository
-import com.wire.kalium.logic.data.conversation.SubconversationRepository
 import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.id.CurrentClientIdProvider
 import com.wire.kalium.logic.data.id.FederatedIdMapper
@@ -80,9 +79,6 @@ class CallManagerTest {
     @Mock
     private val selfConversationIdProvider = mock(SelfConversationIdProvider::class)
 
-    @Mock
-    private val subconversationRepository = mock(SubconversationRepository::class)
-
     @Mock
     private val userConfigRepository = mock(UserConfigRepository::class)
 
@@ -124,7 +120,6 @@ class CallManagerTest {
             currentClientIdProvider = currentClientIdProvider,
             selfConversationIdProvider = selfConversationIdProvider,
             conversationRepository = conversationRepository,
-            subconversationRepository = subconversationRepository,
             userConfigRepository = userConfigRepository,
             messageSender = messageSender,
             kaliumDispatchers = dispatcher,

diff --git a/logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt b/logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
@@ -26,7 +26,6 @@ import com.wire.kalium.logic.data.call.CallRepository
 import com.wire.kalium.logic.data.call.VideoStateChecker
 import com.wire.kalium.logic.data.call.mapper.CallMapper
 import com.wire.kalium.logic.data.conversation.ConversationRepository
-import com.wire.kalium.logic.data.conversation.SubconversationRepository
 import com.wire.kalium.logic.data.id.CurrentClientIdProvider
 import com.wire.kalium.logic.data.id.FederatedIdMapper
 import com.wire.kalium.logic.data.id.QualifiedID
@@ -48,7 +47,6 @@ actual class GlobalCallManager {
         currentClientIdProvider: CurrentClientIdProvider,
         selfConversationIdProvider: SelfConversationIdProvider,
         conversationRepository: ConversationRepository,
-        subconversationRepository: SubconversationRepository,
         userConfigRepository: UserConfigRepository,
         messageSender: MessageSender,
         callMapper: CallMapper,

diff --git a/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/CallManagerImpl.kt b/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/CallManagerImpl.kt
@@ -49,7 +49,6 @@ import com.wire.kalium.logic.data.call.mapper.ParticipantMapperImpl
 import com.wire.kalium.logic.data.conversation.ClientId
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.conversation.ConversationRepository
-import com.wire.kalium.logic.data.conversation.SubconversationRepository
 import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.id.CurrentClientIdProvider
 import com.wire.kalium.logic.data.id.FederatedIdMapper
@@ -114,7 +113,6 @@ class CallManagerImpl internal constructor(
     private val conversationClientsInCallUpdater: ConversationClientsInCallUpdater,
     private val networkStateObserver: NetworkStateObserver,
     private val getCallConversationType: GetCallConversationTypeProvider,
-    private val subconversationRepository: SubconversationRepository,
     private val userConfigRepository: UserConfigRepository,
     private val kaliumConfigs: KaliumConfigs,
     private val mediaManagerService: MediaManagerService,
@@ -216,7 +214,6 @@ class CallManagerImpl internal constructor(
                     .keepingStrongReference(),
                 closeCallHandler = OnCloseCall(
                     callRepository = callRepository,
-                    callHelper = CallHelperImpl(callRepository, subconversationRepository, userConfigRepository),
                     networkStateObserver = networkStateObserver,
                     scope = scope,
                     qualifiedIdMapper = qualifiedIdMapper
@@ -543,11 +540,7 @@ class CallManagerImpl internal constructor(
                     participantMapper = ParticipantMapperImpl(videoStateChecker, callMapper),
                     userRepository = userRepository,
                     userConfigRepository = userConfigRepository,
-                    callHelper = CallHelperImpl(
-                        callRepository = callRepository,
-                        subconversationRepository = subconversationRepository,
-                        userConfigRepository = userConfigRepository
-                    ),
+                    callHelper = CallHelperImpl(),
                     endCall = { endCall(it) },
                     callingScope = scope
                 ).keepingStrongReference()

diff --git a/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt b/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
@@ -31,7 +31,6 @@ import com.wire.kalium.logic.data.call.CallRepository
 import com.wire.kalium.logic.data.call.VideoStateChecker
 import com.wire.kalium.logic.data.call.mapper.CallMapper
 import com.wire.kalium.logic.data.conversation.ConversationRepository
-import com.wire.kalium.logic.data.conversation.SubconversationRepository
 import com.wire.kalium.logic.data.id.CurrentClientIdProvider
 import com.wire.kalium.logic.data.id.FederatedIdMapper
 import com.wire.kalium.logic.data.id.QualifiedID
@@ -85,7 +84,6 @@ actual class GlobalCallManager(
         currentClientIdProvider: CurrentClientIdProvider,
         selfConversationIdProvider: SelfConversationIdProvider,
         conversationRepository: ConversationRepository,
-        subconversationRepository: SubconversationRepository,
         userConfigRepository: UserConfigRepository,
         messageSender: MessageSender,
         callMapper: CallMapper,
@@ -115,7 +113,6 @@ actual class GlobalCallManager(
                 networkStateObserver = networkStateObserver,
                 mediaManagerService = mediaManager,
                 flowManagerService = flowManager,
-                subconversationRepository = subconversationRepository,
                 userConfigRepository = userConfigRepository,
                 kaliumConfigs = kaliumConfigs
             )

diff --git a/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/scenario/OnCloseCall.kt b/logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/scenario/OnCloseCall.kt
@@ -28,7 +28,6 @@ import com.wire.kalium.logger.obfuscateId
 import com.wire.kalium.logic.callingLogger
 import com.wire.kalium.logic.data.call.CallRepository
 import com.wire.kalium.logic.data.call.CallStatus
-import com.wire.kalium.logic.data.call.CallHelper
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.id.QualifiedIdMapper
@@ -40,7 +39,6 @@ import kotlinx.coroutines.launch
 @Suppress("LongParameterList")
 class OnCloseCall(
     private val callRepository: CallRepository,
-    private val callHelper: CallHelper,
     private val scope: CoroutineScope,
     private val qualifiedIdMapper: QualifiedIdMapper,
     private val networkStateObserver: NetworkStateObserver
@@ -65,8 +63,13 @@ class OnCloseCall(
 
         scope.launch {
 
-            val isConnectedToInternet = networkStateObserver.observeNetworkState().value == NetworkState.ConnectedWithInternet
-            if (shouldPersistMissedCall(conversationIdWithDomain, callStatus) && isConnectedToInternet) {
+            val isConnectedToInternet =
+                networkStateObserver.observeNetworkState().value == NetworkState.ConnectedWithInternet
+            if (shouldPersistMissedCall(
+                    conversationIdWithDomain,
+                    callStatus
+                ) && isConnectedToInternet
+            ) {
                 callRepository.persistMissedCall(conversationIdWithDomain)
             }
 
@@ -75,11 +78,8 @@ class OnCloseCall(
                 status = callStatus
             )
 
-            val conversationType =
-                callRepository.getCallMetadataProfile()[conversationIdWithDomain]?.conversationType
-
             if (callRepository.getCallMetadataProfile()[conversationIdWithDomain]?.protocol is Conversation.ProtocolInfo.MLS) {
-                callHelper.handleCallTermination(conversationIdWithDomain, conversationType)
+                callRepository.leaveMlsConference(conversationIdWithDomain)
             }
             callingLogger.i("[OnCloseCall] -> ConversationId: ${conversationId.obfuscateId()} | callStatus: $callStatus")
         }

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/call/CallHelper.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/call/CallHelper.kt
@@ -17,17 +17,8 @@
  */
 package com.wire.kalium.logic.data.call
 
-import com.wire.kalium.logic.callingLogger
-import com.wire.kalium.logic.configuration.UserConfigRepository
 import com.wire.kalium.logic.data.conversation.Conversation
-import com.wire.kalium.logic.data.conversation.SubconversationRepository
 import com.wire.kalium.logic.data.id.ConversationId
-import com.wire.kalium.logic.data.id.SubconversationId
-import com.wire.kalium.logic.data.id.toModel
-import com.wire.kalium.logic.functional.getOrElse
-import com.wire.kalium.logic.functional.onFailure
-import com.wire.kalium.logic.functional.onSuccess
-import com.wire.kalium.network.api.authenticated.conversation.SubconversationDeleteRequest
 
 /**
  * Helper class to handle call related operations.
@@ -53,27 +44,9 @@ interface CallHelper {
         newCallParticipants: List<Participant>,
         previousCallParticipants: List<Participant>
     ): Boolean
-
-    /**
-     * Handle the call termination.
-     * If the call is oneOneOne on SFT, then delete MLS sub conversation
-     * otherwise leave the MLS conference.
-     *
-     * @param conversationId the conversation id.
-     * @param callProtocol the call protocol.
-     * @param conversationType the conversation type.
-     */
-    suspend fun handleCallTermination(
-        conversationId: ConversationId,
-        conversationType: Conversation.Type?
-    )
 }
 
-class CallHelperImpl(
-    private val callRepository: CallRepository,
-    private val subconversationRepository: SubconversationRepository,
-    private val userConfigRepository: UserConfigRepository
-) : CallHelper {
+class CallHelperImpl : CallHelper {
 
     override fun shouldEndSFTOneOnOneCall(
         conversationId: ConversationId,
@@ -94,36 +67,6 @@ class CallHelperImpl(
         }
     }
 
-    override suspend fun handleCallTermination(
-        conversationId: ConversationId,
-        conversationType: Conversation.Type?
-    ) {
-        if (userConfigRepository.shouldUseSFTForOneOnOneCalls().getOrElse(false) &&
-            conversationType == Conversation.Type.ONE_ON_ONE
-        ) {
-            callingLogger.i("[CallHelper] -> fetching remote MLS sub conversation details")
-            subconversationRepository.fetchRemoteSubConversationDetails(
-                conversationId,
-                CALL_SUBCONVERSATION_ID
-            ).onSuccess { subconversationDetails ->
-                callingLogger.i("[CallHelper] -> Deleting remote MLS sub conversation")
-                subconversationRepository.deleteRemoteSubConversation(
-                    subconversationDetails.parentId.toModel(),
-                    SubconversationId(subconversationDetails.id),
-                    SubconversationDeleteRequest(
-                        subconversationDetails.epoch,
-                        subconversationDetails.groupId
-                    )
-                )
-            }.onFailure {
-                callingLogger.e("[CallHelper] -> Error fetching remote MLS sub conversation details")
-            }
-        } else {
-            callingLogger.i("[CallHelper] -> Leaving MLS conference")
-            callRepository.leaveMlsConference(conversationId)
-        }
-    }
-
     companion object {
         const val TWO_PARTICIPANTS = 2
         const val ONE_PARTICIPANTS = 1

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
@@ -1236,7 +1236,6 @@ class UserSessionScope internal constructor(
             userRepository = userRepository,
             currentClientIdProvider = clientIdProvider,
             conversationRepository = conversationRepository,
-            subconversationRepository = subconversationRepository,
             userConfigRepository = userConfigRepository,
             selfConversationIdProvider = selfConversationIdProvider,
             messageSender = messages.messageSender,

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
@@ -26,7 +26,6 @@ import com.wire.kalium.logic.data.call.mapper.CallMapper
 import com.wire.kalium.logic.data.call.CallRepository
 import com.wire.kalium.logic.data.call.VideoStateChecker
 import com.wire.kalium.logic.data.conversation.ConversationRepository
-import com.wire.kalium.logic.data.conversation.SubconversationRepository
 import com.wire.kalium.logic.data.id.FederatedIdMapper
 import com.wire.kalium.logic.data.id.QualifiedID
 import com.wire.kalium.logic.data.id.QualifiedIdMapper
@@ -49,7 +48,6 @@ expect class GlobalCallManager {
         currentClientIdProvider: CurrentClientIdProvider,
         selfConversationIdProvider: SelfConversationIdProvider,
         conversationRepository: ConversationRepository,
-        subconversationRepository: SubconversationRepository,
         userConfigRepository: UserConfigRepository,
         messageSender: MessageSender,
         callMapper: CallMapper,

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/asset/AssetMessageHandler.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/asset/AssetMessageHandler.kt
@@ -60,23 +60,18 @@ internal class AssetMessageHandlerImpl(
                     // asset data then we can not decide now if it is allowed or not
                     // it is safe to continue and the code later will check the original
                     // asset message and decide if it is allowed or not
-                    if (
-                        messageContent.value.name.isNullOrEmpty() &&
-                        messageContent.value.isAssetDataComplete
-                    ) {
-                        kaliumLogger.e("The asset message trying to be processed has invalid data looking locally")
-                        AssetRestrictionContinuationStrategy.RestrictIfThereIsNotOldMessageWithTheSameAssetID
-                    } else {
-                        validateAssetMimeTypeUseCase(
+                    if (validateAssetMimeTypeUseCase(
                             fileName = messageContent.value.name,
                             mimeType = messageContent.value.mimeType,
                             allowedExtension = it.state.allowedType
-                        ).let { validateResult ->
-                            if (validateResult) {
-                                AssetRestrictionContinuationStrategy.Continue
-                            } else {
-                                AssetRestrictionContinuationStrategy.Restrict
-                            }
+                        )
+                    ) {
+                        AssetRestrictionContinuationStrategy.Continue
+                    } else {
+                        if (messageContent.value.name.isNullOrEmpty() && messageContent.value.isAssetDataComplete) {
+                            AssetRestrictionContinuationStrategy.RestrictIfThereIsNotOldMessageWithTheSameAssetID
+                        } else {
+                            AssetRestrictionContinuationStrategy.Restrict
                         }
                     }
                 }