diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 30b2fbe0ccb..1bcab24c19f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -173,7 +173,7 @@ jsoup = "org.jsoup:jsoup:1.18.1" appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" } molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0" timber = "com.jakewharton.timber:timber:5.0.1" -matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.65" +matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.67" 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" } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaLoader.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaLoader.kt index 17ba1d2c4d6..1d07a3e0192 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaLoader.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaLoader.kt @@ -15,7 +15,6 @@ import io.element.android.libraries.matrix.api.media.MediaSource import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.withContext import org.matrix.rustcomponents.sdk.Client -import org.matrix.rustcomponents.sdk.mediaSourceFromUrl import org.matrix.rustcomponents.sdk.use import java.io.File import org.matrix.rustcomponents.sdk.MediaSource as RustMediaSource @@ -86,7 +85,7 @@ class RustMediaLoader( return if (json != null) { RustMediaSource.fromJson(json) } else { - mediaSourceFromUrl(url) + RustMediaSource.fromUrl(url) } } } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapper.kt index 3ff3c1b0983..0da22426ba7 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapper.kt @@ -7,6 +7,7 @@ package io.element.android.libraries.matrix.impl.room.preview +import io.element.android.libraries.core.bool.orFalse import io.element.android.libraries.matrix.api.core.RoomAlias import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo @@ -25,7 +26,7 @@ object RoomPreviewInfoMapper { avatarUrl = info.avatarUrl, numberOfJoinedMembers = info.numJoinedMembers.toLong(), roomType = info.roomType.map(), - isHistoryWorldReadable = info.isHistoryWorldReadable, + isHistoryWorldReadable = info.isHistoryWorldReadable.orFalse(), isJoined = info.membership == Membership.JOINED, isInvited = info.membership == Membership.INVITED, isPublic = info.joinRule == JoinRule.Public,