Merge branch 'develop' into dependabot/github_actions/gradle/wrapper-…

…validation-action-3.3.2
wireapp · May 2, 2024 · 2b2fa7d · 2b2fa7d
2 parents 8f15978 + 6142d0a
commit 2b2fa7d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 31 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -95,6 +95,7 @@
             android:launchMode="singleTop"
             android:hardwareAccelerated="true"
             android:screenOrientation="portrait"
+            android:taskAffinity="wire.call"
             android:theme="@style/AppTheme" />
 
         <activity

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/CallActivity.kt b/app/src/main/kotlin/com/wire/android/ui/calling/CallActivity.kt
@@ -181,6 +181,7 @@ fun getOngoingCallIntent(
     activity: Activity,
     conversationId: String
 ) = Intent(activity, CallActivity::class.java).apply {
+    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
     putExtra(CallActivity.EXTRA_CONVERSATION_ID, conversationId)
     putExtra(CallActivity.EXTRA_SCREEN_TYPE, CallScreenType.Ongoing.name)
 }
@@ -189,12 +190,14 @@ fun getOutgoingCallIntent(
     activity: Activity,
     conversationId: String
 ) = Intent(activity, CallActivity::class.java).apply {
+    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
     putExtra(CallActivity.EXTRA_CONVERSATION_ID, conversationId)
     putExtra(CallActivity.EXTRA_SCREEN_TYPE, CallScreenType.Outgoing.name)
 }
 
 fun getIncomingCallIntent(context: Context, conversationId: String) =
     Intent(context.applicationContext, CallActivity::class.java).apply {
+        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         putExtra(CallActivity.EXTRA_CONVERSATION_ID, conversationId)
         putExtra(CallActivity.EXTRA_SCREEN_TYPE, CallScreenType.Incoming.name)
     }

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/SharedCallingViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/calling/SharedCallingViewModel.kt
@@ -29,8 +29,6 @@ import com.wire.android.mapper.UICallParticipantMapper
 import com.wire.android.mapper.UserTypeMapper
 import com.wire.android.media.CallRinger
 import com.wire.android.model.ImageAsset
-import com.wire.android.util.CurrentScreen
-import com.wire.android.util.CurrentScreenManager
 import com.wire.android.util.dispatchers.DispatcherProvider
 import com.wire.android.util.ui.WireSessionImageLoader
 import com.wire.kalium.logic.data.call.Call
@@ -88,7 +86,6 @@ class SharedCallingViewModel @AssistedInject constructor(
     private val uiCallParticipantMapper: UICallParticipantMapper,
     private val wireSessionImageLoader: WireSessionImageLoader,
     private val userTypeMapper: UserTypeMapper,
-    private val currentScreenManager: CurrentScreenManager,
     private val dispatchers: DispatcherProvider
 ) : ViewModel() {
 
@@ -116,18 +113,6 @@ class SharedCallingViewModel @AssistedInject constructor(
             launch {
                 observeOnSpeaker(this)
             }
-            launch {
-                observeScreenState()
-            }
-        }
-    }
-
-    private suspend fun observeScreenState() {
-        currentScreenManager.observeCurrentScreen(viewModelScope).collect {
-            // clear video preview when the screen is in background to avoid memory leaks
-            if (it == CurrentScreen.InBackground && callState.isCameraOn) {
-                clearVideoPreview()
-            }
         }
     }
 

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt
@@ -145,7 +145,7 @@ fun OngoingCallScreen(
                 sharedCallingViewModel.clearVideoPreview()
                 ongoingCallViewModel.stopSendingVideoFeed()
             },
-            navigateBack = { activity.finish() },
+            onCollapse = { activity.moveTaskToBack(true) },
             requestVideoStreams = ongoingCallViewModel::requestVideoStreams,
             hideDoubleTapToast = ongoingCallViewModel::hideDoubleTapToast,
             onPermissionPermanentlyDenied = {
@@ -160,7 +160,7 @@ fun OngoingCallScreen(
             }
         )
         BackHandler {
-            activity.finish()
+            activity.moveTaskToBack(true)
         }
     }
 
@@ -173,7 +173,8 @@ fun OngoingCallScreen(
         isCameraOn = sharedCallingViewModel.callState.isCameraOn,
         callStatus = sharedCallingViewModel.callState.callStatus,
         startSendingVideoFeed = ongoingCallViewModel::startSendingVideoFeed,
-        pauseSendingVideoFeed = ongoingCallViewModel::pauseSendingVideoFeed
+        pauseSendingVideoFeed = ongoingCallViewModel::pauseSendingVideoFeed,
+        onClearVideoPreview = sharedCallingViewModel::clearVideoPreview
     )
 }
 
@@ -186,7 +187,8 @@ private fun handleVideoPreviewOnLifecycleChange(
     isCameraOn: Boolean,
     callStatus: CallStatus,
     startSendingVideoFeed: () -> Unit,
-    pauseSendingVideoFeed: () -> Unit
+    pauseSendingVideoFeed: () -> Unit,
+    onClearVideoPreview: () -> Unit
 ) {
     val lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current
     DisposableEffect(lifecycleOwner, isCameraOn, callStatus) {
@@ -198,6 +200,9 @@ private fun handleVideoPreviewOnLifecycleChange(
             if (event == Lifecycle.Event.ON_RESUME && callStatus == CallStatus.ESTABLISHED && isCameraOn) {
                 startSendingVideoFeed()
             }
+            if (event == Lifecycle.Event.ON_DESTROY) {
+                onClearVideoPreview()
+            }
         }
 
         lifecycleOwner.lifecycle.addObserver(observer)
@@ -230,7 +235,7 @@ private fun OngoingCallContent(
     flipCamera: () -> Unit,
     setVideoPreview: (view: View) -> Unit,
     clearVideoPreview: () -> Unit,
-    navigateBack: () -> Unit,
+    onCollapse: () -> Unit,
     hideDoubleTapToast: () -> Unit,
     onPermissionPermanentlyDenied: (type: PermissionDenialType) -> Unit,
     requestVideoStreams: (participants: List<UICallParticipant>) -> Unit
@@ -258,7 +263,7 @@ private fun OngoingCallContent(
                     else -> ""
                 },
                 isCbrEnabled = isCbrEnabled,
-                onCollapse = navigateBack,
+                onCollapse = onCollapse,
                 protocolInfo = protocolInfo,
                 mlsVerificationStatus = mlsVerificationStatus,
                 proteusVerificationStatus = proteusVerificationStatus

diff --git a/app/src/test/kotlin/com/wire/android/ui/calling/SharedCallingViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/calling/SharedCallingViewModelTest.kt
@@ -25,8 +25,6 @@ import com.wire.android.config.TestDispatcherProvider
 import com.wire.android.mapper.UICallParticipantMapper
 import com.wire.android.mapper.UserTypeMapper
 import com.wire.android.media.CallRinger
-import com.wire.android.util.CurrentScreen
-import com.wire.android.util.CurrentScreenManager
 import com.wire.android.util.ui.WireSessionImageLoader
 import com.wire.kalium.logic.data.call.VideoState
 import com.wire.kalium.logic.data.id.ConversationId
@@ -48,7 +46,6 @@ import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.verify
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
@@ -109,9 +106,6 @@ class SharedCallingViewModelTest {
     @MockK
     private lateinit var userTypeMapper: UserTypeMapper
 
-    @MockK
-    private lateinit var currentScreenManager: CurrentScreenManager
-
     @MockK(relaxed = true)
     private lateinit var onCompleted: () -> Unit
 
@@ -130,9 +124,6 @@ class SharedCallingViewModelTest {
         coEvery { allCalls.invoke() } returns emptyFlow()
         coEvery { observeConversationDetails.invoke(any()) } returns emptyFlow()
         coEvery { observeSpeaker.invoke() } returns emptyFlow()
-        coEvery { currentScreenManager.observeCurrentScreen(any()) } returns MutableStateFlow(
-            CurrentScreen.SomeOther
-        )
 
         sharedCallingViewModel = SharedCallingViewModel(
             conversationId = conversationId,
@@ -152,7 +143,6 @@ class SharedCallingViewModelTest {
             uiCallParticipantMapper = uiCallParticipantMapper,
             wireSessionImageLoader = wireSessionImageLoader,
             userTypeMapper = userTypeMapper,
-            currentScreenManager = currentScreenManager,
             dispatchers = TestDispatcherProvider()
         )
     }