From 39701c670659b512ef11f94b91b52f2d62a2c57e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 22:59:27 +0000 Subject: [PATCH 1/4] Update dependency org.matrix.rustcomponents:sdk-android to v0.1.5 --- 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 491e568903..48b4b5173f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -125,7 +125,7 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" } appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" } molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" } timber = "com.jakewharton.timber:timber:5.0.1" -matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.4" +matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.5" sqldelight-driver-android = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" } sqldelight-driver-jvm = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" } sqldelight-coroutines = { module = "com.squareup.sqldelight:coroutines-extensions", version.ref = "sqldelight" } From 519714fa43dfe2807153530a94684f7a39a79194 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 29 Mar 2023 09:35:36 +0200 Subject: [PATCH 2/4] Small API change in SDK 0.1.5 --- .../element/android/libraries/matrix/impl/RustMatrixClient.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt index 719c07f586..dcdaffd97a 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt @@ -223,9 +223,9 @@ class RustMatrixClient constructor( ): Result = withContext(dispatchers.io) { runCatching { - mediaSourceFromUrl(url).use { source -> + mediaSourceFromUrl(url).use { mediaSource -> client.getMediaThumbnail( - source = source, + mediaSource = mediaSource, width = width.toULong(), height = height.toULong() ).toUByteArray().toByteArray() From 9079b8683c762a3554afff26018fa59d8c695ba7 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 29 Mar 2023 09:39:45 +0200 Subject: [PATCH 3/4] Small API change in SDK 0.1.5: SlidingSyncState --- .../libraries/matrix/impl/room/RustRoomSummaryDataSource.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomSummaryDataSource.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomSummaryDataSource.kt index 67e00ea6ae..c018377677 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomSummaryDataSource.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomSummaryDataSource.kt @@ -53,7 +53,7 @@ internal class RustRoomSummaryDataSource( private val coroutineScope = CoroutineScope(SupervisorJob() + coroutineDispatchers.io) private val roomSummaries = MutableStateFlow>(emptyList()) - private val state = MutableStateFlow(SlidingSyncState.COLD) + private val state = MutableStateFlow(SlidingSyncState.NOT_LOADED) fun init() { coroutineScope.launch { @@ -101,7 +101,7 @@ internal class RustRoomSummaryDataSource( private suspend fun didReceiveSyncUpdate(summary: UpdateSummary) { Timber.v("UpdateRooms with identifiers: ${summary.rooms}") - if (state.value != SlidingSyncState.LIVE) { + if (state.value != SlidingSyncState.FULLY_LOADED) { return } updateRoomSummaries { From 94905237263cdd1d77ecf2e00c51b91485cc14fc Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 29 Mar 2023 10:41:10 +0200 Subject: [PATCH 4/4] Small API change in SDK 0.1.5: RustRoomMember --- .../matrix/impl/room/RoomMemberMapper.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomMemberMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomMemberMapper.kt index 0347bf3b76..ebc93780ee 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomMemberMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomMemberMapper.kt @@ -25,13 +25,13 @@ object RoomMemberMapper { fun map(roomMember: RustRoomMember): RoomMember = RoomMember( - roomMember.userId, - roomMember.displayName, - roomMember.avatarUrl, - mapMembership(roomMember.membership), - roomMember.isNameAmbiguous, - roomMember.powerLevel, - roomMember.normalizedPowerLevel, + roomMember.userId(), + roomMember.displayName(), + roomMember.avatarUrl(), + mapMembership(roomMember.membership()), + roomMember.isNameAmbiguous(), + roomMember.powerLevel(), + roomMember.normalizedPowerLevel(), ) fun mapMembership(membershipState: RustMembershipState): RoomMembershipState = @@ -42,5 +42,4 @@ object RoomMemberMapper { RustMembershipState.KNOCK -> RoomMembershipState.KNOCK RustMembershipState.LEAVE -> RoomMembershipState.LEAVE } - }