From d5b722fe3a10a4e0be2677d09be4fe48932f90a3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 11 Sep 2024 20:03:29 +0200
Subject: [PATCH 1/3] SDK 0.2.43

---
 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 689c6e6b7f..f01f7ce1a6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -162,7 +162,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.42"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.43"
 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 16efeb1937a5e96b4b6943dae9fe104ede44423e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 11 Sep 2024 20:09:50 +0200
Subject: [PATCH 2/3] Fix API break

---
 .../matrix/impl/room/RustMatrixRoom.kt        |  1 +
 .../matrix/impl/timeline/RustTimeline.kt      | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
index 14aeedfcec..aad3777071 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
@@ -188,6 +188,7 @@ class RustMatrixRoom(
             innerRoom.pinnedEventsTimeline(
                 internalIdPrefix = "pinned_events",
                 maxEventsToLoad = 100u,
+                maxConcurrentRequests = 10u,
             ).let { inner ->
                 createTimeline(inner, mode = Timeline.Mode.PINNED_EVENTS)
             }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
index f48af8d3a3..5cb2c36399 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
@@ -61,9 +61,11 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.matrix.rustcomponents.sdk.EditedContent
 import org.matrix.rustcomponents.sdk.EventTimelineItem
 import org.matrix.rustcomponents.sdk.FormattedBody
 import org.matrix.rustcomponents.sdk.MessageFormat
+import org.matrix.rustcomponents.sdk.PollData
 import org.matrix.rustcomponents.sdk.SendAttachmentJoinHandle
 import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
@@ -274,8 +276,15 @@ class RustTimeline(
         withContext(dispatcher) {
             runCatching<Unit> {
                 getEventTimelineItem(originalEventId, transactionId).use { item ->
+                    val editedContent = EditedContent.RoomMessage(
+                        content = MessageEventContent.from(
+                            body = body,
+                            htmlBody = htmlBody,
+                            intentionalMentions = intentionalMentions
+                        ),
+                    )
                     inner.edit(
-                        newContent = MessageEventContent.from(body, htmlBody, intentionalMentions),
+                        newContent = editedContent,
                         item = item,
                     )
                 }
@@ -434,15 +443,21 @@ class RustTimeline(
                 inner.getEventTimelineItemByEventId(
                     eventId = pollStartId.value
                 )
-            pollStartEvent.use {
-                inner.editPoll(
+            val editedContent = EditedContent.PollStart(
+                pollData = PollData(
                     question = question,
                     answers = answers,
                     maxSelections = maxSelections.toUByte(),
                     pollKind = pollKind.toInner(),
-                    editItem = pollStartEvent,
+                ),
+            )
+            pollStartEvent.use {
+                inner.edit(
+                    newContent = editedContent,
+                    item = it,
                 )
             }
+            Unit
         }
     }
 

From 6645fd27ced0c5b3871101074d7c0cc3ad0fe348 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 11 Sep 2024 20:41:58 +0200
Subject: [PATCH 3/3] Fix detekt false positive.

---
 .../android/libraries/matrix/impl/timeline/RustTimeline.kt     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
index 5cb2c36399..25d7c52c7b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
@@ -457,8 +457,7 @@ class RustTimeline(
                     item = it,
                 )
             }
-            Unit
-        }
+        }.map { }
     }
 
     override suspend fun sendPollResponse(