Update dependency org.matrix.rustcomponents:sdk-android to v25.9.10 (#5323)

* Update dependency org.matrix.rustcomponents:sdk-android to v25.9.10

* normalizedPowerLevel has been removed from the SDK (and was not used).

* SDK API change: handle change on VirtualElementCallWidgetOptions

* Add a TODO

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Benoit Marty <[email protected]>

Author: bmarty

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt

@@ -155,7 +155,6 @@ internal fun SuggestionsPickerViewPreview() {
             membership = RoomMembershipState.JOIN,
             isNameAmbiguous = false,
             powerLevel = 0L,
-            normalizedPowerLevel = 0L,
             isIgnored = false,
             role = RoomMember.Role.User,
             membershipChangeReason = null,

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt

@@ -67,7 +67,6 @@ fun aDmRoomMember(
     membership: RoomMembershipState = RoomMembershipState.JOIN,
     isNameAmbiguous: Boolean = false,
     powerLevel: Long = 0,
-    normalizedPowerLevel: Long = powerLevel,
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
@@ -78,7 +77,6 @@ fun aDmRoomMember(
     membership = membership,
     isNameAmbiguous = isNameAmbiguous,
     powerLevel = powerLevel,
-    normalizedPowerLevel = normalizedPowerLevel,
     isIgnored = isIgnored,
     role = role,
     membershipChangeReason = membershipChangeReason

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt

@@ -148,7 +148,6 @@ fun aRoomMember(
     membership: RoomMembershipState = RoomMembershipState.JOIN,
     isNameAmbiguous: Boolean = false,
     powerLevel: Long = 0L,
-    normalizedPowerLevel: Long = 0L,
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
@@ -159,7 +158,6 @@ fun aRoomMember(
     membership = membership,
     isNameAmbiguous = isNameAmbiguous,
     powerLevel = powerLevel,
-    normalizedPowerLevel = normalizedPowerLevel,
     isIgnored = isIgnored,
     role = role,
     membershipChangeReason = membershipChangeReason,

gradle/libs.versions.toml

@@ -176,7 +176,7 @@ jsoup = "org.jsoup:jsoup:1.21.2"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:2.1.0"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.9.1"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.9.10"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
 matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt

@@ -17,7 +17,6 @@ data class RoomMember(
     val membership: RoomMembershipState,
     val isNameAmbiguous: Boolean,
     val powerLevel: Long,
-    val normalizedPowerLevel: Long,
     val isIgnored: Boolean,
     val role: Role,
     val membershipChangeReason: String?,

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapper.kt

@@ -25,7 +25,6 @@ object RoomMemberMapper {
             membership = mapMembership(roomMember.membership),
             isNameAmbiguous = roomMember.isNameAmbiguous,
             powerLevel = powerLevel,
-            normalizedPowerLevel = roomMember.normalizedPowerLevel.into(),
             isIgnored = roomMember.isIgnored,
             role = mapRole(roomMember.suggestedRoleForPowerLevel, powerLevel),
             membershipChangeReason = roomMember.membershipChangeReason

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

@@ -21,7 +21,8 @@ import org.matrix.rustcomponents.sdk.newVirtualElementCallWidget
 import uniffi.matrix_sdk.EncryptionSystem
 import uniffi.matrix_sdk.HeaderStyle
 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
 
 @ContributesBinding(AppScope::class)
@@ -33,31 +34,38 @@ class DefaultCallWidgetSettingsProvider(
 ) : CallWidgetSettingsProvider {
     override suspend fun provide(baseUrl: String, widgetId: String, encrypted: Boolean, direct: Boolean): MatrixWidgetSettings {
         val isAnalyticsEnabled = analyticsService.userConsentFlow.first()
-        val options = VirtualElementCallWidgetOptions(
+        val properties = VirtualElementCallWidgetProperties(
             elementCallUrl = baseUrl,
             widgetId = widgetId,
-            preload = null,
             fontScale = null,
-            appPrompt = false,
-            confineToRoom = true,
             font = null,
             encryption = if (encrypted) EncryptionSystem.PerParticipantKeys else EncryptionSystem.Unencrypted,
-            intent = CallIntent.START_CALL,
-            hideScreensharing = false,
             posthogUserId = callAnalyticsCredentialsProvider.posthogUserId.takeIf { isAnalyticsEnabled },
             posthogApiHost = callAnalyticsCredentialsProvider.posthogApiHost.takeIf { isAnalyticsEnabled },
             posthogApiKey = callAnalyticsCredentialsProvider.posthogApiKey.takeIf { isAnalyticsEnabled },
             rageshakeSubmitUrl = callAnalyticsCredentialsProvider.rageshakeSubmitUrl,
             sentryDsn = callAnalyticsCredentialsProvider.sentryDsn.takeIf { isAnalyticsEnabled },
             sentryEnvironment = if (buildMeta.buildType == BuildType.RELEASE) "RELEASE" else "DEBUG",
             parentUrl = null,
+        )
+        val config = VirtualElementCallWidgetConfig(
+            preload = null,
+            appPrompt = false,
+            confineToRoom = true,
+            // TODO We probably want to provide different values for this field.
+            intent = CallIntent.START_CALL,
+            hideScreensharing = false,
             // For backwards compatibility, it'll be ignored in recent versions of Element Call
             hideHeader = true,
-            controlledMediaDevices = true,
+            controlledAudioDevices = true,
             header = HeaderStyle.APP_BAR,
             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)
     }
 }

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomMember.kt

@@ -30,7 +30,6 @@ fun aRustRoomMember(
     membership = membership,
     isNameAmbiguous = isNameAmbiguous,
     powerLevel = powerLevel,
-    normalizedPowerLevel = powerLevel,
     isIgnored = isIgnored,
     suggestedRoleForPowerLevel = role,
     membershipChangeReason = membershipChangeReason,

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomMemberFixture.kt

@@ -19,7 +19,6 @@ fun aRoomMember(
     membership: RoomMembershipState = RoomMembershipState.JOIN,
     isNameAmbiguous: Boolean = false,
     powerLevel: Long = 0L,
-    normalizedPowerLevel: Long = 0L,
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
@@ -30,7 +29,6 @@ fun aRoomMember(
     membership = membership,
     isNameAmbiguous = isNameAmbiguous,
     powerLevel = powerLevel,
-    normalizedPowerLevel = normalizedPowerLevel,
     isIgnored = isIgnored,
     role = role,
     membershipChangeReason = membershipChangeReason,

libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/RoomMemberFixture.kt

@@ -19,7 +19,6 @@ fun aRoomMember(
     membership: RoomMembershipState = RoomMembershipState.JOIN,
     isNameAmbiguous: Boolean = false,
     powerLevel: Long = 0L,
-    normalizedPowerLevel: Long = 0L,
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
@@ -30,7 +29,6 @@ fun aRoomMember(
     membership = membership,
     isNameAmbiguous = isNameAmbiguous,
     powerLevel = powerLevel,
-    normalizedPowerLevel = normalizedPowerLevel,
     isIgnored = isIgnored,
     role = role,
     membershipChangeReason = membershipChangeReason,