From 2456b2fa07b7753fc4c89ee33ddd978b7373128d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Apr 2025 10:34:21 +0000 Subject: [PATCH 1/3] fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.4.22 --- 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 eb80ae6b89..d95511c4be 100644 --- a/gradle/libs.versions.toml +++ b/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" } From 7c0318e5fe5b19b3d191da1da78a0c43eeecc3e2 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 22 Apr 2025 12:51:54 +0200 Subject: [PATCH 2/3] change (sdk) : add topic string to NotificationContent.StateEvent.RoomTopic --- .../libraries/matrix/api/notification/NotificationData.kt | 2 +- .../notification/TimelineEventToNotificationContentMapper.kt | 2 +- .../push/impl/notifications/DefaultNotifiableEventResolver.kt | 2 +- .../impl/notifications/DefaultNotifiableEventResolverTest.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt index 2c77f70d0a..5ac236ad80 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt +++ b/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 } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt index e05a4d7e67..cf914abe8d 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt +++ b/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 } diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt index d7557f41df..24357e340a 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt @@ -250,7 +250,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}") diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt index 677727ea8c..479075694e 100644 --- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt +++ b/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) } From baafa24bebbca7b4ba49646e9a3a64141d0827a1 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 22 Apr 2025 14:54:11 +0200 Subject: [PATCH 3/3] test (sdk) : fix api break on EventTimelineItemContent --- .../matrix/impl/fixtures/factories/EventTimelineItemContent.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemContent.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemContent.kt index 6e2def8aff..b7ea8510c2 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemContent.kt +++ b/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, ), )