Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

review: consistency use isAudioCall everywhere (instead of voiceOnly)

Browse source
This commit is contained in:
Valere 2026-03-06 12:19:05 +01:00
parent 283756db70
commit ea12fe436b
12 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
View file

@ -226,7 +226,7 @@ class CallScreenPresenter(
sessionId = inputs.sessionId, sessionId = inputs.sessionId,
roomId = inputs.roomId, roomId = inputs.roomId,
clientId = UUID.randomUUID().toString(), clientId = UUID.randomUUID().toString(),
voiceOnly = inputs.isAudioCall, isAudioCall = inputs.isAudioCall,
languageTag = languageTag, languageTag = languageTag,
theme = theme, theme = theme,
).getOrThrow() ).getOrThrow()

2
features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt
View file

@ -16,7 +16,7 @@ interface CallWidgetProvider {
suspend fun getWidget( suspend fun getWidget(
sessionId: SessionId, sessionId: SessionId,
roomId: RoomId, roomId: RoomId,
voiceOnly: Boolean, isAudioCall: Boolean,
clientId: String, clientId: String,
languageTag: String?, languageTag: String?,
theme: String?, theme: String?,

4
features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt
View file

@ -32,7 +32,7 @@ class DefaultCallWidgetProvider(
override suspend fun getWidget( override suspend fun getWidget(
sessionId: SessionId, sessionId: SessionId,
roomId: RoomId, roomId: RoomId,
voiceOnly: Boolean, isAudioCall: Boolean,
clientId: String, clientId: String,
languageTag: String?, languageTag: String?,
theme: String?, theme: String?,
@ -51,7 +51,7 @@ class DefaultCallWidgetProvider(
baseUrl = baseUrl, baseUrl = baseUrl,
encrypted = isEncrypted, encrypted = isEncrypted,
direct = room.isDm(), direct = room.isDm(),
voiceOnly = voiceOnly, isAudioCall = isAudioCall,
hasActiveCall = roomInfo.hasRoomCall, hasActiveCall = roomInfo.hasRoomCall,
) )
val callUrl = room.generateWidgetWebViewUrl( val callUrl = room.generateWidgetWebViewUrl(

2
features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
View file

@ -23,7 +23,7 @@ class FakeCallWidgetProvider(
override suspend fun getWidget( override suspend fun getWidget(
sessionId: SessionId, sessionId: SessionId,
roomId: RoomId, roomId: RoomId,
voiceOnly: Boolean, isAudioCall: Boolean,
clientId: String, clientId: String,
languageTag: String?, languageTag: String?,
theme: String? theme: String?

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
View file

@ -489,11 +489,11 @@ class MessagesFlowNode(
backstack.push(NavTarget.EditPoll(Timeline.Mode.Thread(navTarget.threadRootId), eventId)) 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( val callType = CallType.RoomCall(
sessionId = sessionId, sessionId = sessionId,
roomId = roomId, roomId = roomId,
isAudioCall = voiceOnly isAudioCall = isAudioCall
) )
analyticsService.captureInteraction(Interaction.Name.MobileRoomCallButton) analyticsService.captureInteraction(Interaction.Name.MobileRoomCallButton)
elementCallEntryPoint.startCall(callType) elementCallEntryPoint.startCall(callType)

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
View file

@ -279,8 +279,8 @@ class MessagesNode(
}, },
onSendLocationClick = callback::navigateToSendLocation, onSendLocationClick = callback::navigateToSendLocation,
onCreatePollClick = callback::navigateToCreatePoll, onCreatePollClick = callback::navigateToCreatePoll,
onJoinCallClick = { voiceOnly -> onJoinCallClick = { isAudioCall ->
callback.navigateToRoomCall(room.roomId, voiceOnly) callback.navigateToRoomCall(room.roomId, isAudioCall)
}, },
onViewAllPinnedMessagesClick = callback::navigateToPinnedMessagesList, onViewAllPinnedMessagesClick = callback::navigateToPinnedMessagesList,
modifier = modifier, modifier = modifier,

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt
View file

@ -130,7 +130,7 @@ class ThreadedMessagesNode(
fun navigateToSendLocation() fun navigateToSendLocation()
fun navigateToCreatePoll() fun navigateToCreatePoll()
fun navigateToEditPoll(eventId: EventId) fun navigateToEditPoll(eventId: EventId)
fun navigateToRoomCall(roomId: RoomId, voiceOnly: Boolean) fun navigateToRoomCall(roomId: RoomId, isAudioCall: Boolean)
fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?)
} }

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/CallMenuItem.kt
View file

@ -36,7 +36,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
@Composable @Composable
internal fun CallMenuItem( internal fun CallMenuItem(
roomCallState: RoomCallState, roomCallState: RoomCallState,
onJoinCallClick: (voiceOnly: Boolean) -> Unit, onJoinCallClick: (isAudioCall: Boolean) -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
when (roomCallState) { when (roomCallState) {
@ -63,7 +63,7 @@ internal fun CallMenuItem(
@Composable @Composable
private fun StandByCallMenuItem( private fun StandByCallMenuItem(
roomCallState: RoomCallState.StandBy, roomCallState: RoomCallState.StandBy,
onJoinCallClick: (voiceOnly: Boolean) -> Unit, onJoinCallClick: (isAudioCall: Boolean) -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
Row(modifier = modifier) { Row(modifier = modifier) {

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt
View file

@ -46,7 +46,7 @@ internal fun TimelineItemCallNotifyView(
event: TimelineItem.Event, event: TimelineItem.Event,
roomCallState: RoomCallState, roomCallState: RoomCallState,
onLongClick: (TimelineItem.Event) -> Unit, onLongClick: (TimelineItem.Event) -> Unit,
onJoinCallClick: (voiceOnly: Boolean) -> Unit, onJoinCallClick: (isAudioCall: Boolean) -> Unit,
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
Row( Row(

2
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallWidgetSettingsProvider.kt
View file

@ -16,7 +16,7 @@ interface CallWidgetSettingsProvider {
widgetId: String = UUID.randomUUID().toString(), widgetId: String = UUID.randomUUID().toString(),
encrypted: Boolean, encrypted: Boolean,
direct: Boolean, direct: Boolean,
voiceOnly: Boolean, isAudioCall: Boolean,
hasActiveCall: Boolean, hasActiveCall: Boolean,
): MatrixWidgetSettings ): MatrixWidgetSettings
} }

6
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/DefaultCallWidgetSettingsProvider.kt
View file

@ -35,7 +35,7 @@ class DefaultCallWidgetSettingsProvider(
widgetId: String, widgetId: String,
encrypted: Boolean, encrypted: Boolean,
direct: Boolean, direct: Boolean,
voiceOnly: Boolean, isAudioCall: Boolean,
hasActiveCall: Boolean hasActiveCall: Boolean
): MatrixWidgetSettings { ): MatrixWidgetSettings {
val isAnalyticsEnabled = analyticsService.userConsentFlow.first() val isAnalyticsEnabled = analyticsService.userConsentFlow.first()
@ -60,11 +60,11 @@ class DefaultCallWidgetSettingsProvider(
// skipLobby = null, // skipLobby = null,
intent = when { intent = when {
direct && hasActiveCall -> { 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 hasActiveCall -> CallIntent.JOIN_EXISTING
direct -> { 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 else -> CallIntent.START_CALL
}.also { }.also {

4
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeCallWidgetSettingsProvider.kt
View file

@ -28,10 +28,10 @@ class FakeCallWidgetSettingsProvider(
widgetId: String, widgetId: String,
encrypted: Boolean, encrypted: Boolean,
direct: Boolean, direct: Boolean,
voiceOnly: Boolean, isAudioCall: Boolean,
hasActiveCall: Boolean hasActiveCall: Boolean
): MatrixWidgetSettings { ): MatrixWidgetSettings {
providedBaseUrls += baseUrl providedBaseUrls += baseUrl
return provideFn(baseUrl, widgetId, encrypted, direct, voiceOnly, hasActiveCall) return provideFn(baseUrl, widgetId, encrypted, direct, isAudioCall, hasActiveCall)
} }
} }