fix: Cant see my video from other client [#WPB-12179]

wireapp · Dec 30, 2024 · a24d68f · a24d68f
1 parent 8847c15
commit a24d68f
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 11 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/di/accountScoped/CallsModule.kt b/app/src/main/kotlin/com/wire/android/di/accountScoped/CallsModule.kt
@@ -202,4 +202,8 @@ class CallsModule {
     @Provides
     fun provideObserveConferenceCallingEnabledUseCase(callsScope: CallsScope) =
         callsScope.observeConferenceCallingEnabled
+
+    @ViewModelScoped
+    @Provides
+    fun provideCurrentClientIdUseCase(callsScope: CallsScope) = callsScope.getCurrentClientIdUseCase
 }
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/CallState.kt b/app/src/main/kotlin/com/wire/android/ui/calling/CallState.kt
@@ -21,6 +21,7 @@ package com.wire.android.ui.calling
 import androidx.compose.runtime.Stable
 import com.wire.android.model.ImageAsset.UserAvatarAsset
 import com.wire.android.ui.home.conversationslist.model.Membership
+import com.wire.android.util.EMPTY
 import com.wire.kalium.logic.data.call.CallStatus
 import com.wire.kalium.logic.data.call.ConversationTypeForCall
 import com.wire.kalium.logic.data.conversation.Conversation
@@ -43,5 +44,6 @@ data class CallState(
     val membership: Membership = Membership.None,
     val protocolInfo: Conversation.ProtocolInfo? = null,
     val mlsVerificationStatus: Conversation.VerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
-    val proteusVerificationStatus: Conversation.VerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
+    val proteusVerificationStatus: Conversation.VerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+    val currentClientId: String = String.EMPTY
 )
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
@@ -30,6 +30,7 @@ import com.wire.android.mapper.UserTypeMapper
 import com.wire.android.media.CallRinger
 import com.wire.android.model.ImageAsset
 import com.wire.android.ui.calling.model.UICallParticipant
+import com.wire.android.util.EMPTY
 import com.wire.android.util.dispatchers.DispatcherProvider
 import com.wire.kalium.logic.data.call.Call
 import com.wire.kalium.logic.data.call.ConversationTypeForCall
@@ -40,6 +41,7 @@ import com.wire.kalium.logic.data.id.ConversationId
 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
+import com.wire.kalium.logic.feature.call.usecase.GetCurrentClientIdUseCase
 import com.wire.kalium.logic.feature.call.usecase.MuteCallUseCase
 import com.wire.kalium.logic.feature.call.usecase.ObserveEstablishedCallWithSortedParticipantsUseCase
 import com.wire.kalium.logic.feature.call.usecase.ObserveSpeakerUseCase
@@ -49,6 +51,7 @@ import com.wire.kalium.logic.feature.call.usecase.TurnLoudSpeakerOnUseCase
 import com.wire.kalium.logic.feature.call.usecase.UnMuteCallUseCase
 import com.wire.kalium.logic.feature.call.usecase.video.UpdateVideoStateUseCase
 import com.wire.kalium.logic.feature.conversation.ObserveConversationDetailsUseCase
+import com.wire.kalium.logic.functional.fold
 import com.wire.kalium.logic.util.PlatformView
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -86,9 +89,9 @@ class SharedCallingViewModel @AssistedInject constructor(
     private val callRinger: CallRinger,
     private val uiCallParticipantMapper: UICallParticipantMapper,
     private val userTypeMapper: UserTypeMapper,
-    private val dispatchers: DispatcherProvider
+    private val dispatchers: DispatcherProvider,
+    private val getCurrentClientIdUseCase: GetCurrentClientIdUseCase
 ) : ViewModel() {
-
     var callState by mutableStateOf(CallState(conversationId))
 
     var participantsState by mutableStateOf(persistentListOf<UICallParticipant>())
@@ -110,6 +113,18 @@ class SharedCallingViewModel @AssistedInject constructor(
             launch {
                 observeOnSpeaker(this)
             }
+            launch {
+                getCurrentClientId()
+            }
+        }
+    }
+
+    private fun getCurrentClientId() {
+        viewModelScope.launch {
+            callState = callState.copy(
+                currentClientId = getCurrentClientIdUseCase()
+                    .fold({ String.EMPTY }, { it.value })
+            )
         }
     }
 

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
@@ -183,7 +183,7 @@ fun OngoingCallScreen(
         onCameraPermissionPermanentlyDenied = onCameraPermissionPermanentlyDenied,
         participants = sharedCallingViewModel.participantsState,
         inPictureInPictureMode = inPictureInPictureMode,
-        currentUserId = ongoingCallViewModel.currentUserId,
+        currentUserId = ongoingCallViewModel.currentUserId
     )
 
     BackHandler {
@@ -417,6 +417,7 @@ private fun OngoingCallContent(
                             onSelfClearVideoPreview = clearVideoPreview,
                             requestVideoStreams = requestVideoStreams,
                             currentUserId = currentUserId,
+                            currentClientId = callState.currentClientId,
                             onDoubleTap = { selectedParticipant ->
                                 onSelectedParticipant(selectedParticipant)
                                 shouldOpenFullScreen = !shouldOpenFullScreen

diff --git a/.../main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/VerticalCallingPager.kt b/.../main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/VerticalCallingPager.kt
@@ -63,6 +63,7 @@ fun VerticalCallingPager(
     isInPictureInPictureMode: Boolean,
     contentHeight: Dp,
     currentUserId: UserId,
+    currentClientId: String,
     onSelfVideoPreviewCreated: (view: View) -> Unit,
     onSelfClearVideoPreview: () -> Unit,
     requestVideoStreams: (participants: List<UICallParticipant>) -> Unit,
@@ -107,6 +108,7 @@ fun VerticalCallingPager(
                             onSelfClearVideoPreview = onSelfClearVideoPreview,
                             onDoubleTap = onDoubleTap,
                             currentUserId = currentUserId,
+                            currentClientId = currentClientId
                         )
                     } else {
                         GroupCallGrid(
@@ -119,6 +121,7 @@ fun VerticalCallingPager(
                             onSelfClearVideoPreview = onSelfClearVideoPreview,
                             onDoubleTap = onDoubleTap,
                             currentUserId = currentUserId,
+                            currentClientId = currentClientId,
                             isInPictureInPictureMode = isInPictureInPictureMode,
                         )
                     }
@@ -179,6 +182,7 @@ private fun PreviewVerticalCallingPager(participants: List<UICallParticipant>) {
         onDoubleTap = { },
         isInPictureInPictureMode = false,
         currentUserId = participants[0].id,
+        currentClientId = "clientId"
     )
 }
 

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
@@ -34,6 +34,7 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.times
+import com.wire.android.BuildConfig
 import com.wire.android.ui.calling.model.UICallParticipant
 import com.wire.android.ui.calling.ongoing.buildPreviewParticipantsList
 import com.wire.android.ui.calling.ongoing.fullscreen.SelectedParticipant
@@ -51,6 +52,7 @@ fun GroupCallGrid(
     isSelfUserCameraOn: Boolean,
     contentHeight: Dp,
     currentUserId: UserId,
+    currentClientId: String,
     onSelfVideoPreviewCreated: (view: View) -> Unit,
     onSelfClearVideoPreview: () -> Unit,
     onDoubleTap: (selectedParticipant: SelectedParticipant) -> Unit,
@@ -82,7 +84,11 @@ fun GroupCallGrid(
             contentType = { getContentType(it.isCameraOn, it.isSharingScreen) }
         ) { participant ->
             // API returns only id.value, without domain, till this get changed compare only id.value
-            val isSelfUser = participant.id.equalsIgnoringBlankDomain(currentUserId)
+            // We also check the client ID because if we are using two devices and one is screen sharing,
+            // the second device cannot be marked as the owner. Otherwise, the shared screen preview will not be visible.
+            val isCurrentUserOwner = participant.id.equalsIgnoringBlankDomain(currentUserId)
+                    && participant.clientId == currentClientId
+                    && !BuildConfig.PICTURE_IN_PICTURE_ENABLED
 
             ParticipantTile(
                 modifier = Modifier
@@ -93,7 +99,7 @@ fun GroupCallGrid(
                                     SelectedParticipant(
                                         userId = participant.id,
                                         clientId = participant.clientId,
-                                        isSelfUser = isSelfUser
+                                        isSelfUser = isCurrentUserOwner
                                     )
                                 )
                             }
@@ -103,7 +109,7 @@ fun GroupCallGrid(
                     .animateItem(),
                 participantTitleState = participant,
                 isOnPiPMode = isInPictureInPictureMode,
-                isSelfUser = isSelfUser,
+                isSelfUser = isCurrentUserOwner,
                 isSelfUserMuted = isSelfUserMuted,
                 isSelfUserCameraOn = isSelfUserCameraOn,
                 onSelfUserVideoPreviewCreated = onSelfVideoPreviewCreated,
@@ -140,6 +146,7 @@ private fun PreviewGroupCallGrid(participants: List<UICallParticipant>, modifier
             onSelfClearVideoPreview = {},
             onDoubleTap = { },
             currentUserId = UserId("id", "domain"),
+            currentClientId = "clientId",
             isInPictureInPictureMode = false,
         )
     }

diff --git a/.../wire/android/ui/calling/ongoing/participantsview/horizentalview/CallingHorizontalView.kt b/.../wire/android/ui/calling/ongoing/participantsview/horizentalview/CallingHorizontalView.kt
@@ -34,6 +34,7 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.times
+import com.wire.android.BuildConfig
 import com.wire.android.ui.calling.model.UICallParticipant
 import com.wire.android.ui.calling.ongoing.buildPreviewParticipantsList
 import com.wire.android.ui.calling.ongoing.fullscreen.SelectedParticipant
@@ -50,6 +51,7 @@ fun CallingHorizontalView(
     isSelfUserCameraOn: Boolean,
     contentHeight: Dp,
     currentUserId: UserId,
+    currentClientId: String,
     onSelfVideoPreviewCreated: (view: View) -> Unit,
     onSelfClearVideoPreview: () -> Unit,
     onDoubleTap: (selectedParticipant: SelectedParticipant) -> Unit,
@@ -70,7 +72,12 @@ fun CallingHorizontalView(
     ) {
         items(items = participants, key = { it.id.toString() + it.clientId }) { participant ->
             // API returns only id.value, without domain, till this get changed compare only id.value
-            val isSelfUser = participant.id.equalsIgnoringBlankDomain(currentUserId)
+            // We also check the client ID because if we are using two devices and one is screen sharing,
+            // the second device cannot be marked as the owner. Otherwise, the shared screen preview will not be visible.
+            val isCurrentUserOwner = participant.id.equalsIgnoringBlankDomain(currentUserId)
+                    && participant.clientId == currentClientId
+                    && !BuildConfig.PICTURE_IN_PICTURE_ENABLED
+
             ParticipantTile(
                 modifier = Modifier
                     .pointerInput(Unit) {
@@ -80,7 +87,7 @@ fun CallingHorizontalView(
                                     SelectedParticipant(
                                         userId = participant.id,
                                         clientId = participant.clientId,
-                                        isSelfUser = isSelfUser
+                                        isSelfUser = isCurrentUserOwner
                                     )
                                 )
                             }
@@ -90,7 +97,7 @@ fun CallingHorizontalView(
                     .height(tileHeight)
                     .animateItem(),
                 participantTitleState = participant,
-                isSelfUser = isSelfUser,
+                isSelfUser = isCurrentUserOwner,
                 isSelfUserMuted = isSelfUserMuted,
                 isSelfUserCameraOn = isSelfUserCameraOn,
                 onSelfUserVideoPreviewCreated = onSelfVideoPreviewCreated,
@@ -112,6 +119,7 @@ fun PreviewCallingHorizontalView(
             isSelfUserCameraOn = false,
             contentHeight = 800.dp,
             currentUserId = UserId("id", "domain"),
+            currentClientId = "clientId",
             onSelfVideoPreviewCreated = {},
             onSelfClearVideoPreview = {},
             onDoubleTap = { },

diff --git a/kalium b/kalium
+27 −0		data/src/commonMain/kotlin/com/wire/kalium/logic/data/call/InCallReactionMessage.kt
+5 −0		data/src/commonMain/kotlin/com/wire/kalium/logic/data/message/Message.kt
+5 −0		data/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt
+1 −0		data/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContentLogging.kt
+1 −1		gradle/libs.versions.toml
+48 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/call/InCallReactionsRepository.kt
+7 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationRepository.kt
+24 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageRepository.kt
+3 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/PersistMessageUseCase.kt
+32 −2		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/ProtoContentMapper.kt
+6 −6		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/user/UserRepository.kt
+11 −3		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+16 −2		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/CallsScope.kt
+38 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/usecase/GetCurrentClientIdUseCase.kt
+39 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/usecase/ObserveInCallReactionsUseCase.kt
+51 −0		...c/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/ClearConversationAssetsLocallyUseCase.kt
+16 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/ConversationScope.kt
+48 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/DeleteConversationLocallyUseCase.kt
+70 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/incallreaction/SendInCallReactionUseCase.kt
+53 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/GetNextAudioMessageInConversationUseCase.kt
+57 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/GetSenderNameByMessageIdUseCase.kt
+16 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/MessageScope.kt
+1 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/MessageSendFailureHandler.kt
+1 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/PersistMigratedMessagesUseCase.kt
+9 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/user/ObserveUserInfoUseCase.kt
+8 −7		...src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/ApplicationMessageHandler.kt
+43 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/call/InCallReactionsRepositoryTest.kt
+19 −1		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/message/ProtoContentMapperTest.kt
+1 −1		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/prekey/MessageSendFailureHandlerTest.kt
+111 −0		...c/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/ClearConversationAssetsLocallyUseCaseTest.kt
+137 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/DeleteConversationLocallyUseCaseTest.kt
+3 −3		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/mls/OneOnOneResolverTest.kt
+119 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/incallreaction/SendInCallReactionUseCaseTest.kt
+109 −0		...src/commonTest/kotlin/com/wire/kalium/logic/feature/message/GetNextAudioMessageInConversationUseCaseTest.kt
+108 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/message/GetSenderNameByMessageIdUseCaseTest.kt
+36 −1		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/user/ObserveUserInfoUseCaseTest.kt
+40 −0		...commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/ApplicationMessageHandlerTest.kt
+2 −2		logic/src/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/repository/UserRepositoryArrangement.kt
+8 −0		persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessageAssetView.sq
+8 −0		persistence/src/commonMain/db_user/com/wire/kalium/persistence/Messages.sq
+4 −0		persistence/src/commonMain/db_user/com/wire/kalium/persistence/Users.sq
+3 −0		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAO.kt
+22 −0		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOImpl.kt
+1 −0		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/UserDatabaseBuilder.kt
+160 −0		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOTest.kt
+20 −7		protobuf-codegen/src/main/proto/messages.proto