feat(calling): end call on member leave or conversation deleted (WPB-…

…2955) (RC) (#1915) * feat(calling): end call on member leave or conversation deleted * chore: detekt * chore: kalium reference
wireapp · Jul 7, 2023 · ea5876b · ea5876b
1 parent 98ed1e2
commit ea5876b
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 9 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/GlobalObserversManager.kt b/app/src/main/kotlin/com/wire/android/GlobalObserversManager.kt
@@ -12,6 +12,7 @@ import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.feature.user.webSocketStatus.ObservePersistentWebSocketConnectionStatusUseCase
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOf
@@ -35,6 +36,13 @@ class GlobalObserversManager @Inject constructor(
 
     fun observe() {
         scope.launch { setUpNotifications() }
+        scope.launch {
+            coreLogic.getGlobalScope().observeValidAccounts().distinctUntilChanged().collectLatest {
+                if (it.isNotEmpty()) {
+                    coreLogic.getSessionScope(it.first().first.id).calls.endCallOnConversationChange()
+                }
+            }
+        }
     }
 
     private suspend fun setUpNotifications() {

diff --git a/app/src/main/kotlin/com/wire/android/di/CoreLogicModule.kt b/app/src/main/kotlin/com/wire/android/di/CoreLogicModule.kt
@@ -39,6 +39,7 @@ import com.wire.kalium.logic.feature.asset.ScheduleNewAssetMessageUseCase
 import com.wire.kalium.logic.feature.auth.AddAuthenticatedUserUseCase
 import com.wire.kalium.logic.feature.auth.LogoutUseCase
 import com.wire.kalium.logic.feature.auth.autoVersioningAuth.AutoVersionAuthScopeUseCase
+import com.wire.kalium.logic.feature.call.usecase.EndCallOnConversationChangeUseCase
 import com.wire.kalium.logic.feature.call.usecase.EndCallUseCase
 import com.wire.kalium.logic.feature.call.usecase.FlipToBackCameraUseCase
 import com.wire.kalium.logic.feature.call.usecase.FlipToFrontCameraUseCase
@@ -624,6 +625,14 @@ class UseCaseModule {
     fun provideEndCallUseCase(@KaliumCoreLogic coreLogic: CoreLogic, @CurrentAccount currentAccount: UserId): EndCallUseCase =
         coreLogic.getSessionScope(currentAccount).calls.endCall
 
+    @ViewModelScoped
+    @Provides
+    fun provideEndCallOnConversationChangeUseCase(
+        @KaliumCoreLogic coreLogic: CoreLogic,
+        @CurrentAccount currentAccount: UserId
+    ): EndCallOnConversationChangeUseCase =
+        coreLogic.getSessionScope(currentAccount).calls.endCallOnConversationChange
+
     @ViewModelScoped
     @Provides
     fun provideMuteCallUseCase(@KaliumCoreLogic coreLogic: CoreLogic, @CurrentAccount currentAccount: UserId): MuteCallUseCase =

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/call/ConversationCallViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/call/ConversationCallViewModel.kt
@@ -31,6 +31,7 @@ import com.wire.android.navigation.NavigationItem
 import com.wire.android.navigation.NavigationManager
 import com.wire.android.navigation.SavedStateViewModel
 import com.wire.kalium.logic.data.conversation.Conversation
+import com.wire.kalium.logic.data.conversation.ConversationDetails
 import com.wire.kalium.logic.data.id.QualifiedID
 import com.wire.kalium.logic.data.id.QualifiedIdMapper
 import com.wire.kalium.logic.data.sync.SyncState
@@ -40,9 +41,12 @@ import com.wire.kalium.logic.feature.call.usecase.EndCallUseCase
 import com.wire.kalium.logic.feature.call.usecase.IsEligibleToStartCallUseCase
 import com.wire.kalium.logic.feature.call.usecase.ObserveEstablishedCallsUseCase
 import com.wire.kalium.logic.feature.call.usecase.ObserveOngoingCallsUseCase
+import com.wire.kalium.logic.feature.conversation.ObserveConversationDetailsUseCase
 import com.wire.kalium.logic.sync.ObserveSyncStateUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
@@ -59,7 +63,8 @@ class ConversationCallViewModel @Inject constructor(
     private val answerCall: AnswerCallUseCase,
     private val endCall: EndCallUseCase,
     private val observeSyncState: ObserveSyncStateUseCase,
-    private val isConferenceCallingEnabled: IsEligibleToStartCallUseCase
+    private val isConferenceCallingEnabled: IsEligibleToStartCallUseCase,
+    private val observeConversationDetails: ObserveConversationDetailsUseCase
 ) : SavedStateViewModel(savedStateHandle) {
 
     val conversationId: QualifiedID = qualifiedIdMapper.fromStringToQualifiedID(
@@ -75,12 +80,21 @@ class ConversationCallViewModel @Inject constructor(
     }
 
     private fun listenOngoingCall() = viewModelScope.launch {
-        observeOngoingCalls()
-            .collect {
-                val hasOngoingCall = it.any { call -> call.conversationId == conversationId }
-
-                conversationCallViewState = conversationCallViewState.copy(hasOngoingCall = hasOngoingCall)
+        combine(observeOngoingCalls(), observeConversationDetails(conversationId)) { calls, conversationDetailsResult ->
+            val hasOngoingCall = calls.any { call -> call.conversationId == conversationId }
+            // valid conversation is a conversation where the user is a member and it's not deleted
+            val validConversation = when (conversationDetailsResult) {
+                is ObserveConversationDetailsUseCase.Result.Success -> {
+                    !(conversationDetailsResult.conversationDetails is ConversationDetails.Group &&
+                            !(conversationDetailsResult.conversationDetails as ConversationDetails.Group).isSelfUserMember)
+                }
+
+                is ObserveConversationDetailsUseCase.Result.Failure -> false
             }
+            hasOngoingCall && validConversation
+        }.collectLatest {
+            conversationCallViewState = conversationCallViewState.copy(hasOngoingCall = it)
+        }
     }
 
     private fun observeEstablishedCall() = viewModelScope.launch {

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationListViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationListViewModel.kt
@@ -497,7 +497,7 @@ private fun ConversationDetails.toConversationItem(
                 conversation.mutedStatus,
                 unreadEventCount
             ),
-            hasOnGoingCall = hasOngoingCall,
+            hasOnGoingCall = hasOngoingCall && this.isSelfUserMember,
             isSelfUserCreator = isSelfUserCreator,
             isSelfUserMember = isSelfUserMember,
             teamId = conversation.teamId,

diff --git a/.../test/kotlin/com/wire/android/ui/home/conversations/call/ConversationCallViewModelTest.kt b/.../test/kotlin/com/wire/android/ui/home/conversations/call/ConversationCallViewModelTest.kt
@@ -28,6 +28,7 @@ import com.wire.kalium.logic.feature.call.usecase.EndCallUseCase
 import com.wire.kalium.logic.feature.call.usecase.IsEligibleToStartCallUseCase
 import com.wire.kalium.logic.feature.call.usecase.ObserveEstablishedCallsUseCase
 import com.wire.kalium.logic.feature.call.usecase.ObserveOngoingCallsUseCase
+import com.wire.kalium.logic.feature.conversation.ObserveConversationDetailsUseCase
 import com.wire.kalium.logic.sync.ObserveSyncStateUseCase
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
@@ -69,6 +70,9 @@ class ConversationCallViewModelTest {
     @MockK
     private lateinit var qualifiedIdMapper: QualifiedIdMapper
 
+    @MockK
+    private lateinit var observeConversationDetails: ObserveConversationDetailsUseCase
+
     private lateinit var conversationCallViewModel: ConversationCallViewModel
 
     @BeforeEach
@@ -90,7 +94,8 @@ class ConversationCallViewModelTest {
             answerCall = joinCall,
             endCall = endCall,
             observeSyncState = observeSyncState,
-            isConferenceCallingEnabled = isConferenceCallingEnabled
+            isConferenceCallingEnabled = isConferenceCallingEnabled,
+            observeConversationDetails = observeConversationDetails
         )
     }
 

diff --git a/kalium b/kalium
+1 −2		logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreLogic.kt
+23 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/auth/login/DomainLookupResult.kt
+11 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/auth/login/SSOLoginRepository.kt
+8 −3		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+1 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/appVersioning/ObserveIfAppUpdateRequiredUseCase.kt
+18 −9		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/AuthenticationScope.kt
+52 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/DomainLookupUseCase.kt
+1 −0		.../src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/autoVersioningAuth/AutoVersionAuthScopeUseCase.kt
+52 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/sso/FetchSSOSettingsUseCase.kt
+1 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/sso/SSOLoginScope.kt
+17 −7		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/CallsScope.kt
+53 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/usecase/EndCallOnConversationChangeUseCase.kt
+2 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/MessageScope.kt
+3 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/ConversationEventReceiver.kt
+3 −2		...src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/ApplicationMessageHandler.kt
+28 −13		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/NewMessageEventHandler.kt
+35 −1		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/auth/login/SSOLoginRepositoryTest.kt
+142 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/DomainLookupUseCaseTest.kt
+112 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/sso/FetchSSOSettingsUseCaseTest.kt
+191 −0		.../src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/EndCallOnConversationChangeUseCaseTest.kt
+175 −3		...rc/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/NewMessageEventHandlerTest.kt
+32 −0		network/src/commonMain/kotlin/com/wire/kalium/network/api/base/unauthenticated/DomainLookupApi.kt
+1 −1		network/src/commonMain/kotlin/com/wire/kalium/network/api/base/unauthenticated/SSOSettingsResponse.kt
+40 −0		network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/unauthenticated/DomainLookupApiV0.kt
+4 −1		...kotlin/com/wire/kalium/network/api/v0/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV0.kt
+25 −0		network/src/commonMain/kotlin/com/wire/kalium/network/api/v2/unauthenticated/DomainLookupApiV2.kt
+4 −1		...kotlin/com/wire/kalium/network/api/v2/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV2.kt
+25 −0		network/src/commonMain/kotlin/com/wire/kalium/network/api/v3/unauthenticated/DomainLookupApiV3.kt
+4 −1		...kotlin/com/wire/kalium/network/api/v3/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV3.kt
+25 −0		network/src/commonMain/kotlin/com/wire/kalium/network/api/v4/unauthenticated/DomainLookupApiV4.kt
+4 −1		...kotlin/com/wire/kalium/network/api/v4/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV4.kt
+2 −0		network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/UnauthenticatedNetworkContainer.kt