From 7c0318e5fe5b19b3d191da1da78a0c43eeecc3e2 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Tue, 22 Apr 2025 12:51:54 +0200
Subject: [PATCH] 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)
     }