change (sdk) : add topic string to NotificationContent.StateEvent.RoomTopic

ganfra · ganfra · commit 7c0318e5fe5b · 2025-04-22T14:53:37.000+02:00
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
@@ -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
@@ -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
@@ -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
@@ -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)
     }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ sealed interface NotificationContent {`
`106`	`106`	`data object RoomServerAcl : StateEvent`
`107`	`107`	`data object RoomThirdPartyInvite : StateEvent`
`108`	`108`	`data object RoomTombstone : StateEvent`
`109`		`- data object RoomTopic : StateEvent`
	`109`	`+ data class RoomTopic(val topic: String) : StateEvent`
`110`	`110`	`data object SpaceChild : StateEvent`
`111`	`111`	`data object SpaceParent : StateEvent`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private fun StateEventContent.toContent(): NotificationContent.StateEvent {`
`62`	`62`	`StateEventContent.RoomServerAcl -> NotificationContent.StateEvent.RoomServerAcl`
`63`	`63`	`StateEventContent.RoomThirdPartyInvite -> NotificationContent.StateEvent.RoomThirdPartyInvite`
`64`	`64`	`StateEventContent.RoomTombstone -> NotificationContent.StateEvent.RoomTombstone`
`65`		`- StateEventContent.RoomTopic -> NotificationContent.StateEvent.RoomTopic`
	`65`	`+ is StateEventContent.RoomTopic -> NotificationContent.StateEvent.RoomTopic(topic)`
`66`	`66`	`StateEventContent.SpaceChild -> NotificationContent.StateEvent.SpaceChild`
`67`	`67`	`StateEventContent.SpaceParent -> NotificationContent.StateEvent.SpaceParent`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,7 @@ class DefaultNotifiableEventResolverTest {`
`783`	`783`	`testFailure(NotificationContent.StateEvent.RoomServerAcl)`
`784`	`784`	`testFailure(NotificationContent.StateEvent.RoomThirdPartyInvite)`
`785`	`785`	`testFailure(NotificationContent.StateEvent.RoomTombstone)`
`786`		`- testFailure(NotificationContent.StateEvent.RoomTopic)`
	`786`	`+ testFailure(NotificationContent.StateEvent.RoomTopic(""))`
`787`	`787`	`testFailure(NotificationContent.StateEvent.SpaceChild)`
`788`	`788`	`testFailure(NotificationContent.StateEvent.SpaceParent)`
`789`	`789`	`}`