Fix compilation issue: RoomAliases does not exist anymore.
This commit is contained in:
parent
76f776a122
commit
85823b3e62
13 changed files with 0 additions and 23 deletions
|
|
@ -18,7 +18,6 @@ object TimelineConfig {
|
||||||
*/
|
*/
|
||||||
val excludedEvents = listOf(
|
val excludedEvents = listOf(
|
||||||
StateEventType.CallMember,
|
StateEventType.CallMember,
|
||||||
StateEventType.RoomAliases,
|
|
||||||
StateEventType.RoomCanonicalAlias,
|
StateEventType.RoomCanonicalAlias,
|
||||||
StateEventType.RoomGuestAccess,
|
StateEventType.RoomGuestAccess,
|
||||||
StateEventType.RoomHistoryVisibility,
|
StateEventType.RoomHistoryVisibility,
|
||||||
|
|
|
||||||
|
|
@ -118,15 +118,6 @@ class StateContentFormatter(
|
||||||
"PolicyRuleUser"
|
"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) {
|
OtherState.RoomCanonicalAlias -> when (renderingMode) {
|
||||||
RenderingMode.RoomList -> {
|
RenderingMode.RoomList -> {
|
||||||
Timber.v("Filtering timeline item for room state change: $content")
|
Timber.v("Filtering timeline item for room state change: $content")
|
||||||
|
|
|
||||||
|
|
@ -601,7 +601,6 @@ class DefaultPinnedMessagesBannerFormatterTest {
|
||||||
OtherState.PolicyRuleRoom,
|
OtherState.PolicyRuleRoom,
|
||||||
OtherState.PolicyRuleServer,
|
OtherState.PolicyRuleServer,
|
||||||
OtherState.PolicyRuleUser,
|
OtherState.PolicyRuleUser,
|
||||||
OtherState.RoomAliases,
|
|
||||||
OtherState.RoomCanonicalAlias,
|
OtherState.RoomCanonicalAlias,
|
||||||
OtherState.RoomGuestAccess,
|
OtherState.RoomGuestAccess,
|
||||||
OtherState.RoomHistoryVisibility,
|
OtherState.RoomHistoryVisibility,
|
||||||
|
|
|
||||||
|
|
@ -746,7 +746,6 @@ class DefaultRoomLatestEventFormatterTest {
|
||||||
OtherState.PolicyRuleRoom,
|
OtherState.PolicyRuleRoom,
|
||||||
OtherState.PolicyRuleServer,
|
OtherState.PolicyRuleServer,
|
||||||
OtherState.PolicyRuleUser,
|
OtherState.PolicyRuleUser,
|
||||||
OtherState.RoomAliases,
|
|
||||||
OtherState.RoomCanonicalAlias,
|
OtherState.RoomCanonicalAlias,
|
||||||
OtherState.RoomGuestAccess,
|
OtherState.RoomGuestAccess,
|
||||||
OtherState.RoomHistoryVisibility,
|
OtherState.RoomHistoryVisibility,
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,6 @@ sealed interface NotificationContent {
|
||||||
data object PolicyRuleRoom : StateEvent
|
data object PolicyRuleRoom : StateEvent
|
||||||
data object PolicyRuleServer : StateEvent
|
data object PolicyRuleServer : StateEvent
|
||||||
data object PolicyRuleUser : StateEvent
|
data object PolicyRuleUser : StateEvent
|
||||||
data object RoomAliases : StateEvent
|
|
||||||
data object RoomAvatar : StateEvent
|
data object RoomAvatar : StateEvent
|
||||||
data object RoomCanonicalAlias : StateEvent
|
data object RoomCanonicalAlias : StateEvent
|
||||||
data object RoomCreate : StateEvent
|
data object RoomCreate : StateEvent
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,6 @@ sealed interface StateEventType {
|
||||||
data object PolicyRuleServer : StateEventType
|
data object PolicyRuleServer : StateEventType
|
||||||
data object PolicyRuleUser : StateEventType
|
data object PolicyRuleUser : StateEventType
|
||||||
data object CallMember : StateEventType
|
data object CallMember : StateEventType
|
||||||
data object RoomAliases : StateEventType
|
|
||||||
data object RoomAvatar : StateEventType
|
data object RoomAvatar : StateEventType
|
||||||
data object RoomCanonicalAlias : StateEventType
|
data object RoomCanonicalAlias : StateEventType
|
||||||
data object RoomCreate : StateEventType
|
data object RoomCreate : StateEventType
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@ sealed interface OtherState {
|
||||||
data object PolicyRuleRoom : OtherState
|
data object PolicyRuleRoom : OtherState
|
||||||
data object PolicyRuleServer : OtherState
|
data object PolicyRuleServer : OtherState
|
||||||
data object PolicyRuleUser : OtherState
|
data object PolicyRuleUser : OtherState
|
||||||
data object RoomAliases : OtherState
|
|
||||||
data class RoomAvatar(val url: String?) : OtherState
|
data class RoomAvatar(val url: String?) : OtherState
|
||||||
data object RoomCanonicalAlias : OtherState
|
data object RoomCanonicalAlias : OtherState
|
||||||
data object RoomCreate : OtherState
|
data object RoomCreate : OtherState
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,6 @@ private fun StateEventContent.toContent(): NotificationContent.StateEvent {
|
||||||
StateEventContent.PolicyRuleRoom -> NotificationContent.StateEvent.PolicyRuleRoom
|
StateEventContent.PolicyRuleRoom -> NotificationContent.StateEvent.PolicyRuleRoom
|
||||||
StateEventContent.PolicyRuleServer -> NotificationContent.StateEvent.PolicyRuleServer
|
StateEventContent.PolicyRuleServer -> NotificationContent.StateEvent.PolicyRuleServer
|
||||||
StateEventContent.PolicyRuleUser -> NotificationContent.StateEvent.PolicyRuleUser
|
StateEventContent.PolicyRuleUser -> NotificationContent.StateEvent.PolicyRuleUser
|
||||||
StateEventContent.RoomAliases -> NotificationContent.StateEvent.RoomAliases
|
|
||||||
StateEventContent.RoomAvatar -> NotificationContent.StateEvent.RoomAvatar
|
StateEventContent.RoomAvatar -> NotificationContent.StateEvent.RoomAvatar
|
||||||
StateEventContent.RoomCanonicalAlias -> NotificationContent.StateEvent.RoomCanonicalAlias
|
StateEventContent.RoomCanonicalAlias -> NotificationContent.StateEvent.RoomCanonicalAlias
|
||||||
StateEventContent.RoomCreate -> NotificationContent.StateEvent.RoomCreate
|
StateEventContent.RoomCreate -> NotificationContent.StateEvent.RoomCreate
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@ fun StateEventType.map(): RustStateEventType = when (this) {
|
||||||
StateEventType.PolicyRuleServer -> RustStateEventType.PolicyRuleServer
|
StateEventType.PolicyRuleServer -> RustStateEventType.PolicyRuleServer
|
||||||
StateEventType.PolicyRuleUser -> RustStateEventType.PolicyRuleUser
|
StateEventType.PolicyRuleUser -> RustStateEventType.PolicyRuleUser
|
||||||
StateEventType.CallMember -> RustStateEventType.CallMember
|
StateEventType.CallMember -> RustStateEventType.CallMember
|
||||||
StateEventType.RoomAliases -> RustStateEventType.RoomAliases
|
|
||||||
StateEventType.RoomAvatar -> RustStateEventType.RoomAvatar
|
StateEventType.RoomAvatar -> RustStateEventType.RoomAvatar
|
||||||
StateEventType.RoomCanonicalAlias -> RustStateEventType.RoomCanonicalAlias
|
StateEventType.RoomCanonicalAlias -> RustStateEventType.RoomCanonicalAlias
|
||||||
StateEventType.RoomCreate -> RustStateEventType.RoomCreate
|
StateEventType.RoomCreate -> RustStateEventType.RoomCreate
|
||||||
|
|
@ -46,7 +45,6 @@ fun RustStateEventType.map(): StateEventType = when (this) {
|
||||||
RustStateEventType.PolicyRuleServer -> StateEventType.PolicyRuleServer
|
RustStateEventType.PolicyRuleServer -> StateEventType.PolicyRuleServer
|
||||||
RustStateEventType.PolicyRuleUser -> StateEventType.PolicyRuleUser
|
RustStateEventType.PolicyRuleUser -> StateEventType.PolicyRuleUser
|
||||||
RustStateEventType.CallMember -> StateEventType.CallMember
|
RustStateEventType.CallMember -> StateEventType.CallMember
|
||||||
RustStateEventType.RoomAliases -> StateEventType.RoomAliases
|
|
||||||
RustStateEventType.RoomAvatar -> StateEventType.RoomAvatar
|
RustStateEventType.RoomAvatar -> StateEventType.RoomAvatar
|
||||||
RustStateEventType.RoomCanonicalAlias -> StateEventType.RoomCanonicalAlias
|
RustStateEventType.RoomCanonicalAlias -> StateEventType.RoomCanonicalAlias
|
||||||
RustStateEventType.RoomCreate -> StateEventType.RoomCreate
|
RustStateEventType.RoomCreate -> StateEventType.RoomCreate
|
||||||
|
|
|
||||||
|
|
@ -223,7 +223,6 @@ private fun RustOtherState.map(): OtherState {
|
||||||
RustOtherState.PolicyRuleRoom -> OtherState.PolicyRuleRoom
|
RustOtherState.PolicyRuleRoom -> OtherState.PolicyRuleRoom
|
||||||
RustOtherState.PolicyRuleServer -> OtherState.PolicyRuleServer
|
RustOtherState.PolicyRuleServer -> OtherState.PolicyRuleServer
|
||||||
RustOtherState.PolicyRuleUser -> OtherState.PolicyRuleUser
|
RustOtherState.PolicyRuleUser -> OtherState.PolicyRuleUser
|
||||||
RustOtherState.RoomAliases -> OtherState.RoomAliases
|
|
||||||
is RustOtherState.RoomAvatar -> OtherState.RoomAvatar(url)
|
is RustOtherState.RoomAvatar -> OtherState.RoomAvatar(url)
|
||||||
RustOtherState.RoomCanonicalAlias -> OtherState.RoomCanonicalAlias
|
RustOtherState.RoomCanonicalAlias -> OtherState.RoomCanonicalAlias
|
||||||
RustOtherState.RoomCreate -> OtherState.RoomCreate
|
RustOtherState.RoomCreate -> OtherState.RoomCreate
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ class StateEventTypeTest {
|
||||||
assertThat(RustStateEventType.PolicyRuleRoom.map()).isEqualTo(StateEventType.PolicyRuleRoom)
|
assertThat(RustStateEventType.PolicyRuleRoom.map()).isEqualTo(StateEventType.PolicyRuleRoom)
|
||||||
assertThat(RustStateEventType.PolicyRuleServer.map()).isEqualTo(StateEventType.PolicyRuleServer)
|
assertThat(RustStateEventType.PolicyRuleServer.map()).isEqualTo(StateEventType.PolicyRuleServer)
|
||||||
assertThat(RustStateEventType.PolicyRuleUser.map()).isEqualTo(StateEventType.PolicyRuleUser)
|
assertThat(RustStateEventType.PolicyRuleUser.map()).isEqualTo(StateEventType.PolicyRuleUser)
|
||||||
assertThat(RustStateEventType.RoomAliases.map()).isEqualTo(StateEventType.RoomAliases)
|
|
||||||
assertThat(RustStateEventType.RoomAvatar.map()).isEqualTo(StateEventType.RoomAvatar)
|
assertThat(RustStateEventType.RoomAvatar.map()).isEqualTo(StateEventType.RoomAvatar)
|
||||||
assertThat(RustStateEventType.RoomCanonicalAlias.map()).isEqualTo(StateEventType.RoomCanonicalAlias)
|
assertThat(RustStateEventType.RoomCanonicalAlias.map()).isEqualTo(StateEventType.RoomCanonicalAlias)
|
||||||
assertThat(RustStateEventType.RoomCreate.map()).isEqualTo(StateEventType.RoomCreate)
|
assertThat(RustStateEventType.RoomCreate.map()).isEqualTo(StateEventType.RoomCreate)
|
||||||
|
|
@ -47,7 +46,6 @@ class StateEventTypeTest {
|
||||||
assertThat(StateEventType.PolicyRuleRoom.map()).isEqualTo(RustStateEventType.PolicyRuleRoom)
|
assertThat(StateEventType.PolicyRuleRoom.map()).isEqualTo(RustStateEventType.PolicyRuleRoom)
|
||||||
assertThat(StateEventType.PolicyRuleServer.map()).isEqualTo(RustStateEventType.PolicyRuleServer)
|
assertThat(StateEventType.PolicyRuleServer.map()).isEqualTo(RustStateEventType.PolicyRuleServer)
|
||||||
assertThat(StateEventType.PolicyRuleUser.map()).isEqualTo(RustStateEventType.PolicyRuleUser)
|
assertThat(StateEventType.PolicyRuleUser.map()).isEqualTo(RustStateEventType.PolicyRuleUser)
|
||||||
assertThat(StateEventType.RoomAliases.map()).isEqualTo(RustStateEventType.RoomAliases)
|
|
||||||
assertThat(StateEventType.RoomAvatar.map()).isEqualTo(RustStateEventType.RoomAvatar)
|
assertThat(StateEventType.RoomAvatar.map()).isEqualTo(RustStateEventType.RoomAvatar)
|
||||||
assertThat(StateEventType.RoomCanonicalAlias.map()).isEqualTo(RustStateEventType.RoomCanonicalAlias)
|
assertThat(StateEventType.RoomCanonicalAlias.map()).isEqualTo(RustStateEventType.RoomCanonicalAlias)
|
||||||
assertThat(StateEventType.RoomCreate.map()).isEqualTo(RustStateEventType.RoomCreate)
|
assertThat(StateEventType.RoomCreate.map()).isEqualTo(RustStateEventType.RoomCreate)
|
||||||
|
|
|
||||||
|
|
@ -302,7 +302,6 @@ class DefaultNotifiableEventResolver(
|
||||||
NotificationContent.StateEvent.PolicyRuleRoom,
|
NotificationContent.StateEvent.PolicyRuleRoom,
|
||||||
NotificationContent.StateEvent.PolicyRuleServer,
|
NotificationContent.StateEvent.PolicyRuleServer,
|
||||||
NotificationContent.StateEvent.PolicyRuleUser,
|
NotificationContent.StateEvent.PolicyRuleUser,
|
||||||
NotificationContent.StateEvent.RoomAliases,
|
|
||||||
NotificationContent.StateEvent.RoomAvatar,
|
NotificationContent.StateEvent.RoomAvatar,
|
||||||
NotificationContent.StateEvent.RoomCanonicalAlias,
|
NotificationContent.StateEvent.RoomCanonicalAlias,
|
||||||
NotificationContent.StateEvent.RoomCreate,
|
NotificationContent.StateEvent.RoomCreate,
|
||||||
|
|
|
||||||
|
|
@ -835,7 +835,6 @@ class DefaultNotifiableEventResolverTest {
|
||||||
testNoResults(NotificationContent.StateEvent.PolicyRuleRoom)
|
testNoResults(NotificationContent.StateEvent.PolicyRuleRoom)
|
||||||
testNoResults(NotificationContent.StateEvent.PolicyRuleServer)
|
testNoResults(NotificationContent.StateEvent.PolicyRuleServer)
|
||||||
testNoResults(NotificationContent.StateEvent.PolicyRuleUser)
|
testNoResults(NotificationContent.StateEvent.PolicyRuleUser)
|
||||||
testNoResults(NotificationContent.StateEvent.RoomAliases)
|
|
||||||
testNoResults(NotificationContent.StateEvent.RoomAvatar)
|
testNoResults(NotificationContent.StateEvent.RoomAvatar)
|
||||||
testNoResults(NotificationContent.StateEvent.RoomCanonicalAlias)
|
testNoResults(NotificationContent.StateEvent.RoomCanonicalAlias)
|
||||||
testNoResults(NotificationContent.StateEvent.RoomCreate)
|
testNoResults(NotificationContent.StateEvent.RoomCreate)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue