From e19da6184d1bd533595f1a38a8efae9565351aff Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Tue, 23 Jul 2024 15:22:11 +0200 Subject: [PATCH 1/4] feat: use SFT for OneOnOne calls if the flag is true --- .../main/kotlin/com/wire/android/ui/calling/CallState.kt | 4 ++-- .../com/wire/android/ui/calling/SharedCallingViewModel.kt | 6 +++--- .../com/wire/android/ui/calling/common/CallerDetails.kt | 8 ++++---- .../android/ui/calling/incoming/IncomingCallScreen.kt | 6 +++--- .../android/ui/calling/outgoing/OutgoingCallScreen.kt | 2 +- 5 files changed, 13 insertions(+), 13 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 index 19a3cf2037d..bfb839c2fd6 100644 --- 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 index 8951611c447..d02bce16ce6 100644 --- 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 index ae1f2295dbd..38e627ba799 100644 --- 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 index 1fbc3b0be99..21117d14968 100644 --- 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 index 934906439e6..e3a4dc09f5f 100644 --- 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, From 1c367b45571e148364e008e767cb455bc0f9fbdc Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Tue, 23 Jul 2024 16:15:46 +0200 Subject: [PATCH 2/4] chore: update kalium reference --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index 1abf5868cb4..5249b53370d 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 1abf5868cb458727d5395f7b665ee575301c0d34 +Subproject commit 5249b53370d1845dabd2b09f4c6126083f28766b From 3e68d7711cdf432c6067e1fe077528c5164a7b8e Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Thu, 25 Jul 2024 15:40:56 +0200 Subject: [PATCH 3/4] chore: update kalium reference --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index 5249b53370d..d2404128df7 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 5249b53370d1845dabd2b09f4c6126083f28766b +Subproject commit d2404128df79a0cf5cb6d852d49ed3b8d326182b From 9acdf1f9de2b41479a0139f6697b4fffd7c9d2ff Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Fri, 26 Jul 2024 11:10:25 +0200 Subject: [PATCH 4/4] chore: update kalium reference --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index d2404128df7..f4bcf0162fb 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit d2404128df79a0cf5cb6d852d49ed3b8d326182b +Subproject commit f4bcf0162fb139457ac7c3acd25e9ca98cda9a2c