Commit with unresolved merge conflicts outside of submodules

wireapp · Jun 24, 2024 · 4fdf18d · 4fdf18d
1 parent b0b485c
commit 4fdf18d
Showing 1 changed file with 16 additions and 0 deletions.
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
@@ -137,6 +137,7 @@ fun OngoingCallScreen(
             hangUpCall = { sharedCallingViewModel.hangUpCall { activity.finishAndRemoveTask() } },
             toggleVideo = sharedCallingViewModel::toggleVideo,
             flipCamera = sharedCallingViewModel::flipCamera,
+<<<<<<< HEAD
             setVideoPreview = {
                 sharedCallingViewModel.setVideoPreview(it)
                 ongoingCallViewModel.startSendingVideoFeed()
@@ -146,6 +147,11 @@ fun OngoingCallScreen(
                 ongoingCallViewModel.stopSendingVideoFeed()
             },
             onCollapse = { activity.moveTaskToBack(true) },
+=======
+            setVideoPreview = sharedCallingViewModel::setVideoPreview,
+            clearVideoPreview = sharedCallingViewModel::clearVideoPreview,
+            navigateBack = navigator::navigateBack,
+>>>>>>> 37e8ed56b (fix: camera on/off button when in fullscreen [WPB-9815] (#3121))
             requestVideoStreams = ongoingCallViewModel::requestVideoStreams,
             hideDoubleTapToast = ongoingCallViewModel::hideDoubleTapToast,
             onPermissionPermanentlyDenied = {
@@ -197,6 +203,16 @@ fun OngoingCallScreen(
             lifecycleOwner.lifecycle.removeObserver(observer)
         }
     }
+
+    // Start/stop sending video feed based on the camera state when the call is established.
+    LaunchedEffect(sharedCallingViewModel.callState.callStatus, sharedCallingViewModel.callState.isCameraOn) {
+        if (sharedCallingViewModel.callState.callStatus == CallStatus.ESTABLISHED) {
+            when (sharedCallingViewModel.callState.isCameraOn) {
+                true -> ongoingCallViewModel.startSendingVideoFeed()
+                false -> ongoingCallViewModel.stopSendingVideoFeed()
+            }
+        }
+    }
 }
 
 @OptIn(ExperimentalMaterial3Api::class)