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

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

Author: ganfra

gradle/libs.versions.toml

@@ -169,7 +169,7 @@ jsoup = "org.jsoup:jsoup:1.19.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.4.11"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.4.22"
 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/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt

@@ -106,7 +106,7 @@ sealed interface NotificationContent {
         data object RoomServerAcl : StateEvent
         data object RoomThirdPartyInvite : StateEvent
         data object RoomTombstone : StateEvent
-        data object RoomTopic : StateEvent
+        data class RoomTopic(val topic: String) : StateEvent
         data object SpaceChild : StateEvent
         data object SpaceParent : StateEvent
     }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt

@@ -62,7 +62,7 @@ private fun StateEventContent.toContent(): NotificationContent.StateEvent {
         StateEventContent.RoomServerAcl -> NotificationContent.StateEvent.RoomServerAcl
         StateEventContent.RoomThirdPartyInvite -> NotificationContent.StateEvent.RoomThirdPartyInvite
         StateEventContent.RoomTombstone -> NotificationContent.StateEvent.RoomTombstone
-        StateEventContent.RoomTopic -> NotificationContent.StateEvent.RoomTopic
+        is StateEventContent.RoomTopic -> NotificationContent.StateEvent.RoomTopic(topic)
         StateEventContent.SpaceChild -> NotificationContent.StateEvent.SpaceChild
         StateEventContent.SpaceParent -> NotificationContent.StateEvent.SpaceParent
     }

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemContent.kt

@@ -27,5 +27,6 @@ fun aRustTimelineItemMessageContent(body: String = "Hello") = TimelineItemConten
         reactions = emptyList(),
         threadRoot = null,
         inReplyTo = null,
+        threadSummary = null,
     ),
 )

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt

@@ -251,7 +251,7 @@ class DefaultNotifiableEventResolver @Inject constructor(
             NotificationContent.StateEvent.RoomServerAcl,
             NotificationContent.StateEvent.RoomThirdPartyInvite,
             NotificationContent.StateEvent.RoomTombstone,
-            NotificationContent.StateEvent.RoomTopic,
+            is NotificationContent.StateEvent.RoomTopic,
             NotificationContent.StateEvent.SpaceChild,
             NotificationContent.StateEvent.SpaceParent -> {
                 Timber.tag(loggerTag.value).d("Ignoring notification for state event ${content.javaClass.simpleName}")

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt

@@ -783,7 +783,7 @@ class DefaultNotifiableEventResolverTest {
         testFailure(NotificationContent.StateEvent.RoomServerAcl)
         testFailure(NotificationContent.StateEvent.RoomThirdPartyInvite)
         testFailure(NotificationContent.StateEvent.RoomTombstone)
-        testFailure(NotificationContent.StateEvent.RoomTopic)
+        testFailure(NotificationContent.StateEvent.RoomTopic(""))
         testFailure(NotificationContent.StateEvent.SpaceChild)
         testFailure(NotificationContent.StateEvent.SpaceParent)
     }