From e7e2f38c3cb0ce813abeeb13bee97a19c6e2cd06 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Nov 2025 15:29:37 +0000 Subject: [PATCH] Update dependency org.matrix.rustcomponents:sdk-android to v25.11.11 (#5716) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependency org.matrix.rustcomponents:sdk-android to v25.11.11 * Fix API breaks: - `Client.loginWithQrCode` is now `Client.newLoginWithQrCodeHandler`. - Rust's `OtherState` can now have `RoomCreate` and `RoomHistoryVisibility` values. - Fix fixtures --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín --- gradle/libs.versions.toml | 2 +- .../matrix/impl/auth/RustMatrixAuthenticationService.kt | 2 +- .../impl/timeline/item/event/TimelineEventContentMapper.kt | 2 ++ .../matrix/impl/fixtures/factories/NotificationItem.kt | 3 +++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 63101fe24c..2844ba1ad7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -177,7 +177,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version # https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt # All new features should not be implemented in the pull request that upgrades the version, developers should # only fix API breaks and may add some TODOs. -matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.11.4" +matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.11.11" # Others coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt index 7065f47574..df4333654b 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt @@ -282,7 +282,7 @@ class RustMatrixAuthenticationService( sessionPaths = emptySessionPaths, qrCodeData = sdkQrCodeLoginData, ) - client.loginWithQrCode( + client.newLoginWithQrCodeHandler( oidcConfiguration = oidcConfiguration, ).use { it.scan( diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt index f2b1ef99b8..31bd59668d 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt @@ -220,6 +220,8 @@ private fun RustOtherState.map(): OtherState { is RustOtherState.RoomTopic -> OtherState.RoomTopic(topic) RustOtherState.SpaceChild -> OtherState.SpaceChild RustOtherState.SpaceParent -> OtherState.SpaceParent + is RustOtherState.RoomCreate -> OtherState.RoomCreate + is RustOtherState.RoomHistoryVisibility -> OtherState.RoomHistoryVisibility } } diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt index c087614249..639dd7b6ec 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt @@ -12,6 +12,7 @@ import io.element.android.libraries.matrix.api.core.ThreadId import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiTimelineEvent import io.element.android.libraries.matrix.test.A_ROOM_NAME import io.element.android.libraries.matrix.test.A_USER_NAME +import org.matrix.rustcomponents.sdk.Action import org.matrix.rustcomponents.sdk.JoinRule import org.matrix.rustcomponents.sdk.NotificationEvent import org.matrix.rustcomponents.sdk.NotificationItem @@ -27,6 +28,7 @@ fun aRustNotificationItem( isNoisy: Boolean? = false, hasMention: Boolean? = false, threadId: ThreadId? = null, + actions: List? = null, ) = NotificationItem( event = event, senderInfo = senderInfo, @@ -34,6 +36,7 @@ fun aRustNotificationItem( isNoisy = isNoisy, hasMention = hasMention, threadId = threadId?.value, + actions = actions, ) fun aRustBatchNotificationResult(