Merge pull request #4966 from element-hq/feature/bma/sdkUpdate

Update sdk to version 25.7.1

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

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" }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/call/ElementWellKnownParser.kt

@@ -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<ElementWellKnown>
-}
-
-@ContributesBinding(AppScope::class)
-class RustElementWellKnownParser @Inject constructor() : ElementWellKnownParser {
-    override fun parse(str: String): Result<ElementWellKnown> {
-        return runCatchingExceptions {
-            makeElementWellKnown(str)
-        }
-    }
-}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/call/FakeElementWellKnownParser.kt

@@ -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<ElementWellKnown>
-) : ElementWellKnownParser {
-    override fun parse(str: String): Result<ElementWellKnown> {
-        return result
-    }
-}

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,