Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 9 commits into from
Jul 29, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e19da61
feat: use SFT for OneOnOne calls if the flag is true
ohassine Jul 23, 2024
1c367b4
chore: update kalium reference
ohassine Jul 23, 2024
1fffbd7
Merge remote-tracking branch 'origin/release/candidate' into use-sft-…
ohassine Jul 23, 2024
7a165eb
Merge branch 'release/candidate' into use-sft-for-OneOnOne-calls-when…
yamilmedina Jul 25, 2024
dab1348
Merge branch 'release/candidate' into use-sft-for-OneOnOne-calls-when…
ohassine Jul 25, 2024
3e68d77
chore: update kalium reference
ohassine Jul 25, 2024
9acdf1f
chore: update kalium reference
ohassine Jul 26, 2024
9efbdda
Merge branch 'release/candidate' into use-sft-for-OneOnOne-calls-when…
alexandreferris Jul 29, 2024
ba55046
Merge branch 'refs/heads/release/candidate' into use-sft-for-OneOnOne…
alexandreferris Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/kotlin/com/wire/android/ui/calling/CallState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/com/wire/android/ui/calling/SharedCallingViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/kotlin/com/wire/android/ui/calling/common/CallerDetails.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -61,7 +61,7 @@ fun CallerDetails(
isCameraOn: Boolean,
isCbrEnabled: Boolean,
avatarAssetId: ImageAsset.UserAvatarAsset?,
conversationType: ConversationType,
conversationTypeForCall: ConversationTypeForCall,
membership: Membership,
callingLabel: String,
protocolInfo: Conversation.ProtocolInfo?,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/com/wire/android/ui/calling/incoming/IncomingCallScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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)

Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/wire/android/ui/calling/outgoing/OutgoingCallScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion kalium
Open in desktop
Submodule kalium updated 29 files
+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
Loading