fix(calling): observe self camera state in full screen mode (WPB-4719) (

#2254) Co-authored-by: Mojtaba Chenani <chenani@outlook.com>
wireapp · Sep 25, 2023 · b333593 · b333593
1 parent 07c5a7d
commit b333593
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/fullscreen/FullScreenTile.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/fullscreen/FullScreenTile.kt
@@ -74,8 +74,16 @@ fun FullScreenTile(
                     ),
                 participantTitleState = it,
                 isSelfUser = selectedParticipant.isSelfUser,
-                isSelfUserCameraOn = selectedParticipant.isSelfUserCameraOn,
-                isSelfUserMuted = selectedParticipant.isSelfUserMuted,
+                isSelfUserCameraOn = if (selectedParticipant.isSelfUser) {
+                    sharedCallingViewModel.callState.isCameraOn
+                } else {
+                    it.isCameraOn
+                },
+                isSelfUserMuted = if (selectedParticipant.isSelfUser) {
+                    sharedCallingViewModel.callState.isMuted!!
+                } else {
+                    it.isMuted
+                },
                 shouldFill = false,
                 isZoomingEnabled = true,
                 onSelfUserVideoPreviewCreated = sharedCallingViewModel::setVideoPreview,

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/fullscreen/SelectedParticipant.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/fullscreen/SelectedParticipant.kt
@@ -22,7 +22,5 @@ import com.wire.kalium.logic.data.user.UserId
 data class SelectedParticipant(
     val userId: UserId = UserId("", ""),
     val clientId: String = "",
-    val isSelfUser: Boolean = false,
-    val isSelfUserCameraOn: Boolean = false,
-    val isSelfUserMuted: Boolean = false
+    val isSelfUser: Boolean = false
 )
diff --git a/...n/kotlin/com/wire/android/ui/calling/ongoing/participantsview/gridview/CallingGridView.kt b/...n/kotlin/com/wire/android/ui/calling/ongoing/participantsview/gridview/CallingGridView.kt
@@ -105,9 +105,7 @@ fun GroupCallGrid(
                                     SelectedParticipant(
                                         userId = participant.id,
                                         clientId = participant.clientId,
-                                        isSelfUser = isSelfUser,
-                                        isSelfUserCameraOn = isSelfUserCameraOn,
-                                        isSelfUserMuted = isSelfUserMuted
+                                        isSelfUser = isSelfUser
                                     )
                                 )
                             }

diff --git a/.../wire/android/ui/calling/ongoing/participantsview/horizentalview/CallingHorizontalView.kt b/.../wire/android/ui/calling/ongoing/participantsview/horizentalview/CallingHorizontalView.kt
@@ -87,9 +87,7 @@ fun CallingHorizontalView(
                                     SelectedParticipant(
                                         userId = participant.id,
                                         clientId = participant.clientId,
-                                        isSelfUser = isSelfUser,
-                                        isSelfUserCameraOn = isSelfUserCameraOn,
-                                        isSelfUserMuted = isSelfUserMuted
+                                        isSelfUser = isSelfUser
                                     )
                                 )
                             }