From 03d6f59623106c4ff9c47504488da0ea6605f0ec Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 1 Jul 2025 15:35:25 +0200 Subject: [PATCH 1/4] SDK 25.7.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 34fdbbcb9f..8b0a9ca619 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -172,7 +172,7 @@ jsoup = "org.jsoup:jsoup:1.21.1" 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.6.25" +matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.7.1" 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" } From 3db4492944190491682eec6733609a5a917a6dff Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 1 Jul 2025 15:36:31 +0200 Subject: [PATCH 2/4] Remove dead code. --- .../impl/call/ElementWellKnownParser.kt | 28 ------------------- .../impl/call/FakeElementWellKnownParser.kt | 18 ------------ 2 files changed, 46 deletions(-) delete mode 100644 libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/call/ElementWellKnownParser.kt delete mode 100644 libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/call/FakeElementWellKnownParser.kt diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/call/ElementWellKnownParser.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/call/ElementWellKnownParser.kt deleted file mode 100644 index 710e18f5ac..0000000000 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/call/ElementWellKnownParser.kt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2024 New Vector Ltd. - * - * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial - * Please see LICENSE files in the repository root for full details. - */ - -package io.element.android.libraries.matrix.impl.call - -import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.libraries.core.extensions.runCatchingExceptions -import io.element.android.libraries.di.AppScope -import org.matrix.rustcomponents.sdk.ElementWellKnown -import org.matrix.rustcomponents.sdk.makeElementWellKnown -import javax.inject.Inject - -interface ElementWellKnownParser { - fun parse(str: String): Result -} - -@ContributesBinding(AppScope::class) -class RustElementWellKnownParser @Inject constructor() : ElementWellKnownParser { - override fun parse(str: String): Result { - return runCatchingExceptions { - makeElementWellKnown(str) - } - } -} diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/call/FakeElementWellKnownParser.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/call/FakeElementWellKnownParser.kt deleted file mode 100644 index 5c37ca6a68..0000000000 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/call/FakeElementWellKnownParser.kt +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2024 New Vector Ltd. - * - * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial - * Please see LICENSE files in the repository root for full details. - */ - -package io.element.android.libraries.matrix.impl.call - -import org.matrix.rustcomponents.sdk.ElementWellKnown - -class FakeElementWellKnownParser( - private val result: Result -) : ElementWellKnownParser { - override fun parse(str: String): Result { - return result - } -} From 94d528dae85a3e69948582cb79089b2b56181b81 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 1 Jul 2025 15:59:11 +0200 Subject: [PATCH 3/4] Suppress deprecation issue. --- .../android/appnav/loggedin/MediaPreviewConfigMigrationTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigrationTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigrationTest.kt index e6a17b440f..459abc64d4 100644 --- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigrationTest.kt +++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigrationTest.kt @@ -5,6 +5,8 @@ * Please see LICENSE files in the repository root for full details. */ +@file:Suppress("DEPRECATION") + package io.element.android.appnav.loggedin import com.google.common.truth.Truth.assertThat From 53a694bc696c38cc54cb97a8ff9579f624f2d262 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 1 Jul 2025 15:59:27 +0200 Subject: [PATCH 4/4] Fix compilation issue. --- .../matrix/impl/fixtures/factories/NotificationItem.kt | 2 ++ 1 file changed, 2 insertions(+) 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 797958e151..b13e48e669 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 @@ -48,6 +48,7 @@ fun aRustNotificationRoomInfo( displayName: String = A_ROOM_NAME, avatarUrl: String? = null, canonicalAlias: String? = null, + topic: String? = null, joinedMembersCount: ULong = 2u, isEncrypted: Boolean? = true, isDirect: Boolean = false, @@ -56,6 +57,7 @@ fun aRustNotificationRoomInfo( displayName = displayName, avatarUrl = avatarUrl, canonicalAlias = canonicalAlias, + topic = topic, joinedMembersCount = joinedMembersCount, isEncrypted = isEncrypted, isDirect = isDirect,