From 6c45945f577425fe2d07bd11927742d3d22d5751 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 15 Sep 2023 10:27:57 +0200
Subject: [PATCH] Update rust sdk to 0.1.53

---
 gradle/libs.versions.toml                                 | 2 +-
 .../matrix/impl/auth/RustMatrixAuthenticationService.kt   | 2 ++
 .../matrix/impl/roomlist/RoomSummaryListProcessor.kt      | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e8a90f9857..ec3d760a27 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -149,7 +149,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.52"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.53"
 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 = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" }
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 6014644733..f2acb0b1be 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
@@ -57,6 +57,8 @@ class RustMatrixAuthenticationService @Inject constructor(
         userAgent = userAgentProvider.provide(),
         oidcConfiguration = oidcConfiguration,
         customSlidingSyncProxy = null,
+        sessionDelegate = null,
+        crossProcessRefreshLockId = null,
     )
     private var currentHomeserver = MutableStateFlow<MatrixHomeServerDetails?>(null)
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt
index 03b58ed2ce..4bade9cc81 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt
@@ -59,7 +59,7 @@ class RoomSummaryListProcessor(
         }
     }
 
-    private suspend fun MutableList<RoomSummary>.applyUpdate(update: RoomListEntriesUpdate) {
+    private fun MutableList<RoomSummary>.applyUpdate(update: RoomListEntriesUpdate) {
         when (update) {
             is RoomListEntriesUpdate.Append -> {
                 val roomSummaries = update.values.map {
@@ -102,7 +102,7 @@ class RoomSummaryListProcessor(
         }
     }
 
-    private suspend fun buildSummaryForRoomListEntry(entry: RoomListEntry): RoomSummary {
+    private fun buildSummaryForRoomListEntry(entry: RoomListEntry): RoomSummary {
         return when (entry) {
             RoomListEntry.Empty -> buildEmptyRoomSummary()
             is RoomListEntry.Filled -> buildAndCacheRoomSummaryForIdentifier(entry.roomId)
@@ -116,9 +116,9 @@ class RoomSummaryListProcessor(
         return RoomSummary.Empty(UUID.randomUUID().toString())
     }
 
-    private suspend fun buildAndCacheRoomSummaryForIdentifier(identifier: String): RoomSummary {
+    private fun buildAndCacheRoomSummaryForIdentifier(identifier: String): RoomSummary {
         val builtRoomSummary = roomListService.roomOrNull(identifier)?.use { roomListItem ->
-            roomListItem.roomInfo().use { roomInfo ->
+            roomListItem.roomInfoBlocking().use { roomInfo ->
                 RoomSummary.Filled(
                     details = roomSummaryDetailsFactory.create(roomInfo)
                 )