diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt index eed4ee7327..da2c57c0ac 100644 --- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt +++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt @@ -226,7 +226,7 @@ class CallScreenPresenter( sessionId = inputs.sessionId, roomId = inputs.roomId, clientId = UUID.randomUUID().toString(), - voiceOnly = inputs.isAudioCall, + isAudioCall = inputs.isAudioCall, languageTag = languageTag, theme = theme, ).getOrThrow() diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt index d4fae4826e..66d7edba72 100644 --- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt +++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt @@ -16,7 +16,7 @@ interface CallWidgetProvider { suspend fun getWidget( sessionId: SessionId, roomId: RoomId, - voiceOnly: Boolean, + isAudioCall: Boolean, clientId: String, languageTag: String?, theme: String?, diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt index f94a1ecd59..b31b6152d0 100644 --- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt +++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt @@ -32,7 +32,7 @@ class DefaultCallWidgetProvider( override suspend fun getWidget( sessionId: SessionId, roomId: RoomId, - voiceOnly: Boolean, + isAudioCall: Boolean, clientId: String, languageTag: String?, theme: String?, @@ -51,7 +51,7 @@ class DefaultCallWidgetProvider( baseUrl = baseUrl, encrypted = isEncrypted, direct = room.isDm(), - voiceOnly = voiceOnly, + isAudioCall = isAudioCall, hasActiveCall = roomInfo.hasRoomCall, ) val callUrl = room.generateWidgetWebViewUrl( diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt index a76add7d28..ebc00b0e8f 100644 --- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt +++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt @@ -23,7 +23,7 @@ class FakeCallWidgetProvider( override suspend fun getWidget( sessionId: SessionId, roomId: RoomId, - voiceOnly: Boolean, + isAudioCall: Boolean, clientId: String, languageTag: String?, theme: String? diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt index 1d832935ea..8342184b12 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt @@ -489,11 +489,11 @@ class MessagesFlowNode( backstack.push(NavTarget.EditPoll(Timeline.Mode.Thread(navTarget.threadRootId), eventId)) } - override fun navigateToRoomCall(roomId: RoomId, voiceOnly: Boolean) { + override fun navigateToRoomCall(roomId: RoomId, isAudioCall: Boolean) { val callType = CallType.RoomCall( sessionId = sessionId, roomId = roomId, - isAudioCall = voiceOnly + isAudioCall = isAudioCall ) analyticsService.captureInteraction(Interaction.Name.MobileRoomCallButton) elementCallEntryPoint.startCall(callType) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt index f8529bf005..0c0b3e5448 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt @@ -279,8 +279,8 @@ class MessagesNode( }, onSendLocationClick = callback::navigateToSendLocation, onCreatePollClick = callback::navigateToCreatePoll, - onJoinCallClick = { voiceOnly -> - callback.navigateToRoomCall(room.roomId, voiceOnly) + onJoinCallClick = { isAudioCall -> + callback.navigateToRoomCall(room.roomId, isAudioCall) }, onViewAllPinnedMessagesClick = callback::navigateToPinnedMessagesList, modifier = modifier, diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt index 6ab9bbc506..2c2b8e5f01 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt @@ -130,7 +130,7 @@ class ThreadedMessagesNode( fun navigateToSendLocation() fun navigateToCreatePoll() fun navigateToEditPoll(eventId: EventId) - fun navigateToRoomCall(roomId: RoomId, voiceOnly: Boolean) + fun navigateToRoomCall(roomId: RoomId, isAudioCall: Boolean) fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/CallMenuItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/CallMenuItem.kt index a370866f1e..28f5011652 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/CallMenuItem.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/CallMenuItem.kt @@ -36,7 +36,7 @@ import io.element.android.libraries.ui.strings.CommonStrings @Composable internal fun CallMenuItem( roomCallState: RoomCallState, - onJoinCallClick: (voiceOnly: Boolean) -> Unit, + onJoinCallClick: (isAudioCall: Boolean) -> Unit, modifier: Modifier = Modifier, ) { when (roomCallState) { @@ -63,7 +63,7 @@ internal fun CallMenuItem( @Composable private fun StandByCallMenuItem( roomCallState: RoomCallState.StandBy, - onJoinCallClick: (voiceOnly: Boolean) -> Unit, + onJoinCallClick: (isAudioCall: Boolean) -> Unit, modifier: Modifier = Modifier, ) { Row(modifier = modifier) { diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt index 203b4949b0..a6ae2d9ee5 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt @@ -46,7 +46,7 @@ internal fun TimelineItemCallNotifyView( event: TimelineItem.Event, roomCallState: RoomCallState, onLongClick: (TimelineItem.Event) -> Unit, - onJoinCallClick: (voiceOnly: Boolean) -> Unit, + onJoinCallClick: (isAudioCall: Boolean) -> Unit, modifier: Modifier = Modifier ) { Row( diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallWidgetSettingsProvider.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallWidgetSettingsProvider.kt index dd4fa3eb66..d0686e8e5f 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallWidgetSettingsProvider.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallWidgetSettingsProvider.kt @@ -16,7 +16,7 @@ interface CallWidgetSettingsProvider { widgetId: String = UUID.randomUUID().toString(), encrypted: Boolean, direct: Boolean, - voiceOnly: Boolean, + isAudioCall: Boolean, hasActiveCall: Boolean, ): MatrixWidgetSettings } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/DefaultCallWidgetSettingsProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/DefaultCallWidgetSettingsProvider.kt index 7cf11d97e0..490e4e3683 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/DefaultCallWidgetSettingsProvider.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/DefaultCallWidgetSettingsProvider.kt @@ -35,7 +35,7 @@ class DefaultCallWidgetSettingsProvider( widgetId: String, encrypted: Boolean, direct: Boolean, - voiceOnly: Boolean, + isAudioCall: Boolean, hasActiveCall: Boolean ): MatrixWidgetSettings { val isAnalyticsEnabled = analyticsService.userConsentFlow.first() @@ -60,11 +60,11 @@ class DefaultCallWidgetSettingsProvider( // skipLobby = null, intent = when { direct && hasActiveCall -> { - if (voiceOnly) CallIntent.JOIN_EXISTING_DM_VOICE else CallIntent.JOIN_EXISTING_DM + if (isAudioCall) CallIntent.JOIN_EXISTING_DM_VOICE else CallIntent.JOIN_EXISTING_DM } hasActiveCall -> CallIntent.JOIN_EXISTING direct -> { - if (voiceOnly) CallIntent.START_CALL_DM_VOICE else CallIntent.START_CALL_DM + if (isAudioCall) CallIntent.START_CALL_DM_VOICE else CallIntent.START_CALL_DM } else -> CallIntent.START_CALL }.also { diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeCallWidgetSettingsProvider.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeCallWidgetSettingsProvider.kt index e038415eb3..f33a645b5d 100644 --- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeCallWidgetSettingsProvider.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeCallWidgetSettingsProvider.kt @@ -28,10 +28,10 @@ class FakeCallWidgetSettingsProvider( widgetId: String, encrypted: Boolean, direct: Boolean, - voiceOnly: Boolean, + isAudioCall: Boolean, hasActiveCall: Boolean ): MatrixWidgetSettings { providedBaseUrls += baseUrl - return provideFn(baseUrl, widgetId, encrypted, direct, voiceOnly, hasActiveCall) + return provideFn(baseUrl, widgetId, encrypted, direct, isAudioCall, hasActiveCall) } }