From 39d7977918924abc11b7919c44f7d8f02f3d60b3 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Tue, 4 Jun 2024 14:30:38 +0200
Subject: [PATCH] matrix : update rust sdk to 0.2.23

---
 gradle/libs.versions.toml                                 | 2 +-
 .../android/libraries/matrix/api/room/MessageEventType.kt | 1 +
 .../libraries/matrix/impl/room/MessageEventType.kt        | 2 ++
 .../libraries/matrix/impl/room/RoomContentForwarder.kt    | 8 +++++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 43f369288d..dd78de11c7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -162,7 +162,7 @@ jsoup = "org.jsoup:jsoup:1.17.2"
 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.22"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.23"
 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/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MessageEventType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MessageEventType.kt
index ea9e37cfd6..753cefda83 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MessageEventType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MessageEventType.kt
@@ -21,6 +21,7 @@ enum class MessageEventType {
     CALL_INVITE,
     CALL_HANGUP,
     CALL_CANDIDATES,
+    CALL_NOTIFY,
     KEY_VERIFICATION_READY,
     KEY_VERIFICATION_START,
     KEY_VERIFICATION_CANCEL,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventType.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventType.kt
index bce74bc2db..e0f56288db 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventType.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventType.kt
@@ -24,6 +24,7 @@ fun MessageEventType.map(): MessageLikeEventType = when (this) {
     MessageEventType.CALL_INVITE -> MessageLikeEventType.CALL_INVITE
     MessageEventType.CALL_HANGUP -> MessageLikeEventType.CALL_HANGUP
     MessageEventType.CALL_CANDIDATES -> MessageLikeEventType.CALL_CANDIDATES
+    MessageEventType.CALL_NOTIFY -> MessageLikeEventType.CALL_NOTIFY
     MessageEventType.KEY_VERIFICATION_READY -> MessageLikeEventType.KEY_VERIFICATION_READY
     MessageEventType.KEY_VERIFICATION_START -> MessageLikeEventType.KEY_VERIFICATION_START
     MessageEventType.KEY_VERIFICATION_CANCEL -> MessageLikeEventType.KEY_VERIFICATION_CANCEL
@@ -49,6 +50,7 @@ fun MessageLikeEventType.map(): MessageEventType = when (this) {
     MessageLikeEventType.CALL_INVITE -> MessageEventType.CALL_INVITE
     MessageLikeEventType.CALL_HANGUP -> MessageEventType.CALL_HANGUP
     MessageLikeEventType.CALL_CANDIDATES -> MessageEventType.CALL_CANDIDATES
+    MessageLikeEventType.CALL_NOTIFY -> MessageEventType.CALL_NOTIFY
     MessageLikeEventType.KEY_VERIFICATION_READY -> MessageEventType.KEY_VERIFICATION_READY
     MessageLikeEventType.KEY_VERIFICATION_START -> MessageEventType.KEY_VERIFICATION_START
     MessageLikeEventType.KEY_VERIFICATION_CANCEL -> MessageEventType.KEY_VERIFICATION_CANCEL
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt
index 1688763d4c..a1ea8a0a37 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt
@@ -49,7 +49,13 @@ class RoomContentForwarder(
         toRoomIds: List<RoomId>,
         timeoutMs: Long = 5000L
     ) {
-        val content = fromTimeline.getTimelineEventContentByEventId(eventId.value)
+        val content = fromTimeline
+            .getEventTimelineItemByEventId(eventId.value)
+            .content()
+            .asMessage()
+            ?.content()
+            ?: throw ForwardEventException(toRoomIds)
+
         val targetSlidingSyncRooms = toRoomIds.mapNotNull { roomId -> roomListService.roomOrNull(roomId.value) }
         val targetRooms = targetSlidingSyncRooms.map { slidingSyncRoom ->
             slidingSyncRoom.use { it.fullRoomWithTimeline(null) }