From 85823b3e6264a30d41332b580644dc6d5af95d74 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 8 Apr 2026 14:45:15 +0200 Subject: [PATCH] Fix compilation issue: RoomAliases does not exist anymore. --- .../io/element/android/appconfig/TimelineConfig.kt | 1 - .../eventformatter/impl/StateContentFormatter.kt | 9 --------- .../impl/DefaultPinnedMessagesBannerFormatterTest.kt | 1 - .../impl/DefaultRoomLatestEventFormatterTest.kt | 1 - .../matrix/api/notification/NotificationData.kt | 1 - .../android/libraries/matrix/api/room/StateEventType.kt | 1 - .../matrix/api/timeline/item/event/OtherState.kt | 1 - .../TimelineEventToNotificationContentMapper.kt | 1 - .../android/libraries/matrix/impl/room/StateEventType.kt | 2 -- .../timeline/item/event/TimelineEventContentMapper.kt | 1 - .../libraries/matrix/impl/room/StateEventTypeTest.kt | 2 -- .../impl/notifications/DefaultNotifiableEventResolver.kt | 1 - .../notifications/DefaultNotifiableEventResolverTest.kt | 1 - 13 files changed, 23 deletions(-) diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt index d4fe7d1fc5..7e5f064ef4 100644 --- a/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt +++ b/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt @@ -18,7 +18,6 @@ object TimelineConfig { */ val excludedEvents = listOf( StateEventType.CallMember, - StateEventType.RoomAliases, StateEventType.RoomCanonicalAlias, StateEventType.RoomGuestAccess, StateEventType.RoomHistoryVisibility, diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt index f9d38fd8a7..5abfa89ef0 100644 --- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt +++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt @@ -118,15 +118,6 @@ class StateContentFormatter( "PolicyRuleUser" } } - OtherState.RoomAliases -> when (renderingMode) { - RenderingMode.RoomList -> { - Timber.v("Filtering timeline item for room state change: $content") - null - } - RenderingMode.Timeline -> { - "RoomAliases" - } - } OtherState.RoomCanonicalAlias -> when (renderingMode) { RenderingMode.RoomList -> { Timber.v("Filtering timeline item for room state change: $content") diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt index e91bed409e..38334afad5 100644 --- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt +++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt @@ -601,7 +601,6 @@ class DefaultPinnedMessagesBannerFormatterTest { OtherState.PolicyRuleRoom, OtherState.PolicyRuleServer, OtherState.PolicyRuleUser, - OtherState.RoomAliases, OtherState.RoomCanonicalAlias, OtherState.RoomGuestAccess, OtherState.RoomHistoryVisibility, diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt index 2345af8a33..e1e8717c4c 100644 --- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt +++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt @@ -746,7 +746,6 @@ class DefaultRoomLatestEventFormatterTest { OtherState.PolicyRuleRoom, OtherState.PolicyRuleServer, OtherState.PolicyRuleUser, - OtherState.RoomAliases, OtherState.RoomCanonicalAlias, OtherState.RoomGuestAccess, OtherState.RoomHistoryVisibility, 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 5dce175237..c58a458865 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 @@ -95,7 +95,6 @@ sealed interface NotificationContent { data object PolicyRuleRoom : StateEvent data object PolicyRuleServer : StateEvent data object PolicyRuleUser : StateEvent - data object RoomAliases : StateEvent data object RoomAvatar : StateEvent data object RoomCanonicalAlias : StateEvent data object RoomCreate : StateEvent diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt index 41d64afff1..705dd25122 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt @@ -13,7 +13,6 @@ sealed interface StateEventType { data object PolicyRuleServer : StateEventType data object PolicyRuleUser : StateEventType data object CallMember : StateEventType - data object RoomAliases : StateEventType data object RoomAvatar : StateEventType data object RoomCanonicalAlias : StateEventType data object RoomCreate : StateEventType diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt index ed3f53169f..8b4a7eaa13 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt @@ -16,7 +16,6 @@ sealed interface OtherState { data object PolicyRuleRoom : OtherState data object PolicyRuleServer : OtherState data object PolicyRuleUser : OtherState - data object RoomAliases : OtherState data class RoomAvatar(val url: String?) : OtherState data object RoomCanonicalAlias : OtherState data object RoomCreate : OtherState 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 96c4bdf3c4..7e65a1cc5c 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 @@ -49,7 +49,6 @@ private fun StateEventContent.toContent(): NotificationContent.StateEvent { StateEventContent.PolicyRuleRoom -> NotificationContent.StateEvent.PolicyRuleRoom StateEventContent.PolicyRuleServer -> NotificationContent.StateEvent.PolicyRuleServer StateEventContent.PolicyRuleUser -> NotificationContent.StateEvent.PolicyRuleUser - StateEventContent.RoomAliases -> NotificationContent.StateEvent.RoomAliases StateEventContent.RoomAvatar -> NotificationContent.StateEvent.RoomAvatar StateEventContent.RoomCanonicalAlias -> NotificationContent.StateEvent.RoomCanonicalAlias StateEventContent.RoomCreate -> NotificationContent.StateEvent.RoomCreate diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt index 76fea0beef..897d9a34cb 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt @@ -16,7 +16,6 @@ fun StateEventType.map(): RustStateEventType = when (this) { StateEventType.PolicyRuleServer -> RustStateEventType.PolicyRuleServer StateEventType.PolicyRuleUser -> RustStateEventType.PolicyRuleUser StateEventType.CallMember -> RustStateEventType.CallMember - StateEventType.RoomAliases -> RustStateEventType.RoomAliases StateEventType.RoomAvatar -> RustStateEventType.RoomAvatar StateEventType.RoomCanonicalAlias -> RustStateEventType.RoomCanonicalAlias StateEventType.RoomCreate -> RustStateEventType.RoomCreate @@ -46,7 +45,6 @@ fun RustStateEventType.map(): StateEventType = when (this) { RustStateEventType.PolicyRuleServer -> StateEventType.PolicyRuleServer RustStateEventType.PolicyRuleUser -> StateEventType.PolicyRuleUser RustStateEventType.CallMember -> StateEventType.CallMember - RustStateEventType.RoomAliases -> StateEventType.RoomAliases RustStateEventType.RoomAvatar -> StateEventType.RoomAvatar RustStateEventType.RoomCanonicalAlias -> StateEventType.RoomCanonicalAlias RustStateEventType.RoomCreate -> StateEventType.RoomCreate diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt index 2145bd2a7d..d617df60db 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt @@ -223,7 +223,6 @@ private fun RustOtherState.map(): OtherState { RustOtherState.PolicyRuleRoom -> OtherState.PolicyRuleRoom RustOtherState.PolicyRuleServer -> OtherState.PolicyRuleServer RustOtherState.PolicyRuleUser -> OtherState.PolicyRuleUser - RustOtherState.RoomAliases -> OtherState.RoomAliases is RustOtherState.RoomAvatar -> OtherState.RoomAvatar(url) RustOtherState.RoomCanonicalAlias -> OtherState.RoomCanonicalAlias RustOtherState.RoomCreate -> OtherState.RoomCreate diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/StateEventTypeTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/StateEventTypeTest.kt index 428bb7db7a..93a8f0908f 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/StateEventTypeTest.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/StateEventTypeTest.kt @@ -20,7 +20,6 @@ class StateEventTypeTest { assertThat(RustStateEventType.PolicyRuleRoom.map()).isEqualTo(StateEventType.PolicyRuleRoom) assertThat(RustStateEventType.PolicyRuleServer.map()).isEqualTo(StateEventType.PolicyRuleServer) assertThat(RustStateEventType.PolicyRuleUser.map()).isEqualTo(StateEventType.PolicyRuleUser) - assertThat(RustStateEventType.RoomAliases.map()).isEqualTo(StateEventType.RoomAliases) assertThat(RustStateEventType.RoomAvatar.map()).isEqualTo(StateEventType.RoomAvatar) assertThat(RustStateEventType.RoomCanonicalAlias.map()).isEqualTo(StateEventType.RoomCanonicalAlias) assertThat(RustStateEventType.RoomCreate.map()).isEqualTo(StateEventType.RoomCreate) @@ -47,7 +46,6 @@ class StateEventTypeTest { assertThat(StateEventType.PolicyRuleRoom.map()).isEqualTo(RustStateEventType.PolicyRuleRoom) assertThat(StateEventType.PolicyRuleServer.map()).isEqualTo(RustStateEventType.PolicyRuleServer) assertThat(StateEventType.PolicyRuleUser.map()).isEqualTo(RustStateEventType.PolicyRuleUser) - assertThat(StateEventType.RoomAliases.map()).isEqualTo(RustStateEventType.RoomAliases) assertThat(StateEventType.RoomAvatar.map()).isEqualTo(RustStateEventType.RoomAvatar) assertThat(StateEventType.RoomCanonicalAlias.map()).isEqualTo(RustStateEventType.RoomCanonicalAlias) assertThat(StateEventType.RoomCreate.map()).isEqualTo(RustStateEventType.RoomCreate) 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 cf76b26e64..64583bd1d4 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 @@ -302,7 +302,6 @@ class DefaultNotifiableEventResolver( NotificationContent.StateEvent.PolicyRuleRoom, NotificationContent.StateEvent.PolicyRuleServer, NotificationContent.StateEvent.PolicyRuleUser, - NotificationContent.StateEvent.RoomAliases, NotificationContent.StateEvent.RoomAvatar, NotificationContent.StateEvent.RoomCanonicalAlias, NotificationContent.StateEvent.RoomCreate, 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 63b903a3f7..44ce65d4ac 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 @@ -835,7 +835,6 @@ class DefaultNotifiableEventResolverTest { testNoResults(NotificationContent.StateEvent.PolicyRuleRoom) testNoResults(NotificationContent.StateEvent.PolicyRuleServer) testNoResults(NotificationContent.StateEvent.PolicyRuleUser) - testNoResults(NotificationContent.StateEvent.RoomAliases) testNoResults(NotificationContent.StateEvent.RoomAvatar) testNoResults(NotificationContent.StateEvent.RoomCanonicalAlias) testNoResults(NotificationContent.StateEvent.RoomCreate)