feat: use SFT for OneOnOne calls if the flag is true (WPB-7153) (#3225)

Co-authored-by: Yamil Medina <[email protected]> Co-authored-by: Alexandre Ferris <[email protected]>
wireapp · Jul 29, 2024 · 7389744 · 7389744
1 parent 1da258d
commit 7389744
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
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
@@ -22,7 +22,7 @@ import com.wire.android.model.ImageAsset.UserAvatarAsset
 import com.wire.android.ui.calling.model.UICallParticipant
 import com.wire.android.ui.home.conversationslist.model.Membership
 import com.wire.kalium.logic.data.call.CallStatus
-import com.wire.kalium.logic.data.call.ConversationType
+import com.wire.kalium.logic.data.call.ConversationTypeForCall
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.id.ConversationId
 
@@ -38,7 +38,7 @@ data class CallState(
     val isOnFrontCamera: Boolean = true,
     val isSpeakerOn: Boolean = false,
     val isCbrEnabled: Boolean = false,
-    val conversationType: ConversationType = ConversationType.OneOnOne,
+    val conversationTypeForCall: ConversationTypeForCall = ConversationTypeForCall.OneOnOne,
     val membership: Membership = Membership.None,
     val protocolInfo: Conversation.ProtocolInfo? = null,
     val mlsVerificationStatus: Conversation.VerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,

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
@@ -33,7 +33,7 @@ import com.wire.android.util.dispatchers.DispatcherProvider
 import com.wire.android.util.ui.WireSessionImageLoader
 import com.wire.kalium.logic.data.call.Call
 import com.wire.kalium.logic.data.call.CallStatus
-import com.wire.kalium.logic.data.call.ConversationType
+import com.wire.kalium.logic.data.call.ConversationTypeForCall
 import com.wire.kalium.logic.data.call.VideoState
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.conversation.ConversationDetails
@@ -128,7 +128,7 @@ class SharedCallingViewModel @AssistedInject constructor(
                     is ConversationDetails.Group -> {
                         callState.copy(
                             conversationName = getConversationName(details.conversation.name),
-                            conversationType = ConversationType.Conference,
+                            conversationTypeForCall = ConversationTypeForCall.Conference,
                             protocolInfo = details.conversation.protocol,
                             mlsVerificationStatus = details.conversation.mlsVerificationStatus,
                             proteusVerificationStatus = details.conversation.proteusVerificationStatus
@@ -141,7 +141,7 @@ class SharedCallingViewModel @AssistedInject constructor(
                             avatarAssetId = details.otherUser.completePicture?.let { assetId ->
                                 ImageAsset.UserAvatarAsset(wireSessionImageLoader, assetId)
                             },
-                            conversationType = ConversationType.OneOnOne,
+                            conversationTypeForCall = ConversationTypeForCall.OneOnOne,
                             membership = userTypeMapper.toMembership(details.otherUser.userType),
                             protocolInfo = details.conversation.protocol,
                             mlsVerificationStatus = details.conversation.mlsVerificationStatus,

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/common/CallerDetails.kt b/app/src/main/kotlin/com/wire/android/ui/calling/common/CallerDetails.kt
@@ -49,7 +49,7 @@ import com.wire.android.ui.home.conversationslist.model.Membership
 import com.wire.android.ui.home.conversationslist.model.hasLabel
 import com.wire.android.ui.theme.wireTypography
 import com.wire.android.util.EMPTY
-import com.wire.kalium.logic.data.call.ConversationType
+import com.wire.kalium.logic.data.call.ConversationTypeForCall
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.id.ConversationId
 import java.util.Locale
@@ -61,7 +61,7 @@ fun CallerDetails(
     isCameraOn: Boolean,
     isCbrEnabled: Boolean,
     avatarAssetId: ImageAsset.UserAvatarAsset?,
-    conversationType: ConversationType,
+    conversationTypeForCall: ConversationTypeForCall,
     membership: Membership,
     callingLabel: String,
     protocolInfo: Conversation.ProtocolInfo?,
@@ -130,7 +130,7 @@ fun CallerDetails(
             modifier = Modifier.padding(top = dimensions().spacing8x)
         )
 
-        if (!isCameraOn && conversationType == ConversationType.OneOnOne) {
+        if (!isCameraOn && conversationTypeForCall == ConversationTypeForCall.OneOnOne) {
             UserProfileAvatar(
                 avatarData = UserAvatarData(avatarAssetId),
                 size = dimensions().outgoingCallUserAvatarSize,
@@ -149,7 +149,7 @@ fun PreviewCallerDetails() {
         isCameraOn = false,
         isCbrEnabled = false,
         avatarAssetId = null,
-        conversationType = ConversationType.OneOnOne,
+        conversationTypeForCall = ConversationTypeForCall.OneOnOne,
         membership = Membership.Guest,
         callingLabel = String.EMPTY,
         protocolInfo = null,

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/incoming/IncomingCallScreen.kt b/app/src/main/kotlin/com/wire/android/ui/calling/incoming/IncomingCallScreen.kt
@@ -56,7 +56,7 @@ import com.wire.android.ui.common.visbility.rememberVisibilityState
 import com.wire.android.ui.home.conversations.PermissionPermanentlyDeniedDialogState
 import com.wire.android.ui.theme.wireTypography
 import com.wire.android.util.permission.rememberRecordAudioPermissionFlow
-import com.wire.kalium.logic.data.call.ConversationType
+import com.wire.kalium.logic.data.call.ConversationTypeForCall
 import com.wire.kalium.logic.data.id.ConversationId
 
 @Suppress("ParameterWrapping")
@@ -247,7 +247,7 @@ private fun IncomingCallContent(
                 onVideoPreviewCreated = onVideoPreviewCreated,
                 onSelfClearVideoPreview = onSelfClearVideoPreview
             )
-            val isCallingString = if (callState.conversationType == ConversationType.Conference) {
+            val isCallingString = if (callState.conversationTypeForCall == ConversationTypeForCall.Conference) {
                 stringResource(R.string.calling_label_incoming_call_someone_calling, callState.callerName ?: "")
             } else stringResource(R.string.calling_label_incoming_call)
 
@@ -257,7 +257,7 @@ private fun IncomingCallContent(
                 isCameraOn = callState.isCameraOn,
                 isCbrEnabled = callState.isCbrEnabled,
                 avatarAssetId = callState.avatarAssetId,
-                conversationType = callState.conversationType,
+                conversationTypeForCall = callState.conversationTypeForCall,
                 membership = callState.membership,
                 callingLabel = isCallingString,
                 protocolInfo = callState.protocolInfo,

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/outgoing/OutgoingCallScreen.kt b/app/src/main/kotlin/com/wire/android/ui/calling/outgoing/OutgoingCallScreen.kt
@@ -175,7 +175,7 @@ private fun OutgoingCallContent(
                 isCameraOn = callState.isCameraOn,
                 isCbrEnabled = callState.isCbrEnabled,
                 avatarAssetId = callState.avatarAssetId,
-                conversationType = callState.conversationType,
+                conversationTypeForCall = callState.conversationTypeForCall,
                 membership = callState.membership,
                 callingLabel = stringResource(id = R.string.calling_label_ringing_call),
                 protocolInfo = callState.protocolInfo,

diff --git a/kalium b/kalium
+1 −1		data/src/commonMain/kotlin/com/wire/kalium/logic/data/call/ConversationTypeForCall.kt
+5 −0		logic/src/androidInstrumentedTest/kotlin/com/wire/kalium/logic/feature/call/CallManagerTest.kt
+3 −4		logic/src/androidInstrumentedTest/kotlin/com/wire/kalium/logic/feature/call/scenario/OnIncomingCallTest.kt
+2 −0		logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/call/CallManagerImpl.kt
+2 −0		logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
+8 −9		logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/CallManagerImpl.kt
+3 −0		logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
+2 −2		logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/scenario/OnIncomingCall.kt
+2 −2		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/call/CallRepository.kt
+44 −28		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/call/mapper/CallMapper.kt
+6 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationMapper.kt
+8 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationRepository.kt
+1 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/featureConfig/FeatureConfigMapper.kt
+24 −12		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+2 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/CallManager.kt
+10 −7		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/CallsScope.kt
+2 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
+71 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/usecase/GetCallConversationTypeProvider.kt
+6 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/usecase/StartCallUseCase.kt
+17 −7		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/call/CallMapperTest.kt
+10 −10		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/call/CallRepositoryTest.kt
+259 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/GetCallConversationTypeProviderTest.kt
+21 −4		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/StartCallUseCaseTest.kt
+1 −1		...del/src/commonMain/kotlin/com/wire/kalium/network/api/authenticated/featureConfigs/FeatureConfigResponse.kt
+3 −0		persistence/src/commonMain/db_user/com/wire/kalium/persistence/Conversations.sq
+2 −2		persistence/src/commonMain/db_user/com/wire/kalium/persistence/Notification.sq
+1 −0		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationDAO.kt
+5 −0		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationDAOImpl.kt
+24 −5		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageNotificationsTest.kt