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 26d101a46e1..4b751d6e390 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 @@ -37,7 +37,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 @@ -145,7 +145,7 @@ class SharedCallingViewModel @Inject 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 @@ -158,7 +158,7 @@ class SharedCallingViewModel @Inject 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 83bbc428d0a..1288948acf0 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 @@ -51,7 +51,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 @@ -63,7 +63,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().initiatingCallUserAvatarSize, @@ -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 7ae8da0d606..82a1c1c2727 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 @@ -62,7 +62,7 @@ import com.wire.android.ui.destinations.OngoingCallScreenDestination import com.wire.android.ui.theme.wireTypography import com.wire.android.util.extension.openAppInfoScreen import com.wire.android.util.permission.rememberCallingRecordAudioRequestFlow -import com.wire.kalium.logic.data.call.ConversationType +import com.wire.kalium.logic.data.call.ConversationTypeForCall import com.wire.kalium.logic.data.id.ConversationId @RootNavGraph @@ -212,7 +212,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) @@ -222,7 +222,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/initiating/InitiatingCallScreen.kt b/app/src/main/kotlin/com/wire/android/ui/calling/initiating/InitiatingCallScreen.kt index 89ba4cfe8ea..134749ac85f 100644 --- a/app/src/main/kotlin/com/wire/android/ui/calling/initiating/InitiatingCallScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/calling/initiating/InitiatingCallScreen.kt @@ -154,7 +154,7 @@ private fun InitiatingCallContent( 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 index 0af67ce97e8..f712fc2340d 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 0af67ce97e89ab8999340e2e16c2a399a9b300ae +Subproject commit f712fc2340d8c798a141fec2fd1e3a7b20cc68bb