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

SDK API change: handle change on VirtualElementCallWidgetOptions

Browse source
This commit is contained in:
Benoit Marty 2025-09-11 08:58:36 +02:00
parent cd830266ca
commit 2e5a042774
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,8 @@ import org.matrix.rustcomponents.sdk.newVirtualElementCallWidget
import uniffi.matrix_sdk.EncryptionSystem import uniffi.matrix_sdk.EncryptionSystem
import uniffi.matrix_sdk.HeaderStyle import uniffi.matrix_sdk.HeaderStyle
import uniffi.matrix_sdk.NotificationType import uniffi.matrix_sdk.NotificationType
import uniffi.matrix_sdk.VirtualElementCallWidgetOptions import uniffi.matrix_sdk.VirtualElementCallWidgetConfig
import uniffi.matrix_sdk.VirtualElementCallWidgetProperties
import uniffi.matrix_sdk.Intent as CallIntent import uniffi.matrix_sdk.Intent as CallIntent
@ContributesBinding(AppScope::class) @ContributesBinding(AppScope::class)
@ -33,17 +34,12 @@ class DefaultCallWidgetSettingsProvider(
) : CallWidgetSettingsProvider { ) : CallWidgetSettingsProvider {
override suspend fun provide(baseUrl: String, widgetId: String, encrypted: Boolean, direct: Boolean): MatrixWidgetSettings { override suspend fun provide(baseUrl: String, widgetId: String, encrypted: Boolean, direct: Boolean): MatrixWidgetSettings {
val isAnalyticsEnabled = analyticsService.userConsentFlow.first() val isAnalyticsEnabled = analyticsService.userConsentFlow.first()
val options = VirtualElementCallWidgetOptions( val properties = VirtualElementCallWidgetProperties(
elementCallUrl = baseUrl, elementCallUrl = baseUrl,
widgetId = widgetId, widgetId = widgetId,
preload = null,
fontScale = null, fontScale = null,
appPrompt = false,
confineToRoom = true,
font = null, font = null,
encryption = if (encrypted) EncryptionSystem.PerParticipantKeys else EncryptionSystem.Unencrypted, encryption = if (encrypted) EncryptionSystem.PerParticipantKeys else EncryptionSystem.Unencrypted,
intent = CallIntent.START_CALL,
hideScreensharing = false,
posthogUserId = callAnalyticsCredentialsProvider.posthogUserId.takeIf { isAnalyticsEnabled }, posthogUserId = callAnalyticsCredentialsProvider.posthogUserId.takeIf { isAnalyticsEnabled },
posthogApiHost = callAnalyticsCredentialsProvider.posthogApiHost.takeIf { isAnalyticsEnabled }, posthogApiHost = callAnalyticsCredentialsProvider.posthogApiHost.takeIf { isAnalyticsEnabled },
posthogApiKey = callAnalyticsCredentialsProvider.posthogApiKey.takeIf { isAnalyticsEnabled }, posthogApiKey = callAnalyticsCredentialsProvider.posthogApiKey.takeIf { isAnalyticsEnabled },
@ -51,13 +47,24 @@ class DefaultCallWidgetSettingsProvider(
sentryDsn = callAnalyticsCredentialsProvider.sentryDsn.takeIf { isAnalyticsEnabled }, sentryDsn = callAnalyticsCredentialsProvider.sentryDsn.takeIf { isAnalyticsEnabled },
sentryEnvironment = if (buildMeta.buildType == BuildType.RELEASE) "RELEASE" else "DEBUG", sentryEnvironment = if (buildMeta.buildType == BuildType.RELEASE) "RELEASE" else "DEBUG",
parentUrl = null, parentUrl = null,
)
val config = VirtualElementCallWidgetConfig(
preload = null,
appPrompt = false,
confineToRoom = true,
intent = CallIntent.START_CALL,
hideScreensharing = false,
// For backwards compatibility, it'll be ignored in recent versions of Element Call // For backwards compatibility, it'll be ignored in recent versions of Element Call
hideHeader = true, hideHeader = true,
controlledMediaDevices = true, controlledAudioDevices = true,
header = HeaderStyle.APP_BAR, header = HeaderStyle.APP_BAR,
sendNotificationType = if (direct) NotificationType.RING else NotificationType.NOTIFICATION, sendNotificationType = if (direct) NotificationType.RING else NotificationType.NOTIFICATION,
skipLobby = null,
)
val rustWidgetSettings = newVirtualElementCallWidget(
props = properties,
config = config,
) )
val rustWidgetSettings = newVirtualElementCallWidget(options)
return MatrixWidgetSettings.fromRustWidgetSettings(rustWidgetSettings) return MatrixWidgetSettings.fromRustWidgetSettings(rustWidgetSettings)
} }
} }