Merge pull request #4834 from element-hq/renovate/org.matrix.rustcomponents-sdk-android-25.x

fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.6.6

Author: ganfra

gradle/libs.versions.toml

@@ -172,7 +172,7 @@ jsoup = "org.jsoup:jsoup:1.20.1"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:2.1.0"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.6.3"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.6.6"
 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" }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapper.kt

@@ -31,6 +31,9 @@ import org.matrix.rustcomponents.sdk.FormattedBody as RustFormattedBody
 import org.matrix.rustcomponents.sdk.MessageFormat as RustMessageFormat
 import org.matrix.rustcomponents.sdk.MessageType as RustMessageType
 
+// https://github.com/Johennes/matrix-spec-proposals/blob/johannes/msgtype-galleries/proposals/4274-inline-media-galleries.md#unstable-prefix
+private const val MSG_TYPE_GALLERY_UNSTABLE = "dm.filament.gallery"
+
 class EventMessageMapper {
     private val inReplyToMapper by lazy { InReplyToMapper(TimelineEventContentMapper()) }
 
@@ -112,6 +115,10 @@ class EventMessageMapper {
         is MessageType.Other -> {
             OtherMessageType(type.msgtype, type.body)
         }
+        is MessageType.Gallery -> {
+            // TODO expose the GalleryType.
+            OtherMessageType(MSG_TYPE_GALLERY_UNSTABLE, type.content.body)
+        }
     }
 }
 

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/reply/InReplyToMapper.kt

@@ -12,31 +12,31 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.InReplyTo
 import io.element.android.libraries.matrix.impl.timeline.item.event.TimelineEventContentMapper
 import io.element.android.libraries.matrix.impl.timeline.item.event.map
+import org.matrix.rustcomponents.sdk.EmbeddedEventDetails
 import org.matrix.rustcomponents.sdk.InReplyToDetails
-import org.matrix.rustcomponents.sdk.RepliedToEventDetails
 
 class InReplyToMapper(
     private val timelineEventContentMapper: TimelineEventContentMapper,
 ) {
     fun map(inReplyToDetails: InReplyToDetails): InReplyTo {
         val inReplyToId = EventId(inReplyToDetails.eventId())
         return when (val event = inReplyToDetails.event()) {
-            is RepliedToEventDetails.Ready -> {
+            is EmbeddedEventDetails.Ready -> {
                 InReplyTo.Ready(
                     eventId = inReplyToId,
                     content = timelineEventContentMapper.map(event.content),
                     senderId = UserId(event.sender),
                     senderProfile = event.senderProfile.map(),
                 )
             }
-            is RepliedToEventDetails.Error -> InReplyTo.Error(
+            is EmbeddedEventDetails.Error -> InReplyTo.Error(
                 eventId = inReplyToId,
                 message = event.message,
             )
-            RepliedToEventDetails.Pending -> InReplyTo.Pending(
+            EmbeddedEventDetails.Pending -> InReplyTo.Pending(
                 eventId = inReplyToId,
             )
-            is RepliedToEventDetails.Unavailable -> InReplyTo.NotLoaded(
+            is EmbeddedEventDetails.Unavailable -> InReplyTo.NotLoaded(
                 eventId = inReplyToId
             )
         }