Merge pull request #6553 from element-hq/renovate/org.matrix.rustcomponents-sdk-android-26.x

Update dependency org.matrix.rustcomponents:sdk-android to v26.04.8

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,

gradle/libs.versions.toml

@@ -178,7 +178,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
 # https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
 # All new features should not be implemented in the pull request that upgrades the version, developers should
 # only fix API breaks and may add some TODOs.
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.03.31"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.04.8"
 
 # Others
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }

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")

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,

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,

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

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

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

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

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

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

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItem.kt

@@ -14,10 +14,9 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import org.matrix.rustcomponents.sdk.EventOrTransactionId
 import org.matrix.rustcomponents.sdk.EventSendState
 import org.matrix.rustcomponents.sdk.EventTimelineItem
-import org.matrix.rustcomponents.sdk.EventTimelineItemDebugInfo
+import org.matrix.rustcomponents.sdk.LazyTimelineItemProvider
 import org.matrix.rustcomponents.sdk.ProfileDetails
 import org.matrix.rustcomponents.sdk.Receipt
-import org.matrix.rustcomponents.sdk.ShieldState
 import org.matrix.rustcomponents.sdk.TimelineItemContent
 import uniffi.matrix_sdk_ui.EventItemOrigin
 
@@ -26,37 +25,35 @@ internal fun aRustEventTimelineItem(
     eventOrTransactionId: EventOrTransactionId = EventOrTransactionId.EventId(AN_EVENT_ID.value),
     sender: String = A_USER_ID.value,
     senderProfile: ProfileDetails = ProfileDetails.Unavailable,
+    forwarder: String? = null,
+    forwarderProfile: ProfileDetails? = null,
     isOwn: Boolean = true,
     isEditable: Boolean = true,
     content: TimelineItemContent = aRustTimelineItemContentMsgLike(),
+    eventTypeRaw: String? = null,
     timestamp: ULong = 0uL,
-    debugInfo: EventTimelineItemDebugInfo = anEventTimelineItemDebugInfo(),
     localSendState: EventSendState? = null,
+    localCreatedAt: ULong? = null,
     readReceipts: Map<String, Receipt> = emptyMap(),
     origin: EventItemOrigin? = EventItemOrigin.SYNC,
     canBeRepliedTo: Boolean = true,
-    shieldsState: ShieldState = ShieldState.None,
+    lazyProvider: LazyTimelineItemProvider = FakeFfiLazyTimelineItemProvider(),
-    localCreatedAt: ULong? = null,
-    forwarder: String? = null,
-    forwarderProfile: ProfileDetails? = null,
 ) = EventTimelineItem(
     isRemote = isRemote,
     eventOrTransactionId = eventOrTransactionId,
     sender = sender,
     senderProfile = senderProfile,
-    timestamp = timestamp,
-    isOwn = isOwn,
-    isEditable = isEditable,
-    canBeRepliedTo = canBeRepliedTo,
-    content = content,
-    localSendState = localSendState,
-    readReceipts = readReceipts,
-    origin = origin,
-    localCreatedAt = localCreatedAt,
-    lazyProvider = FakeFfiLazyTimelineItemProvider(
-        debugInfo = debugInfo,
-        shieldsState = shieldsState,
-    ),
     forwarder = forwarder,
     forwarderProfile = forwarderProfile,
+    isOwn = isOwn,
+    isEditable = isEditable,
+    content = content,
+    eventTypeRaw = eventTypeRaw,
+    timestamp = timestamp,
+    localSendState = localSendState,
+    localCreatedAt = localCreatedAt,
+    readReceipts = readReceipts,
+    origin = origin,
+    canBeRepliedTo = canBeRepliedTo,
+    lazyProvider = lazyProvider,
 )

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)

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,

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)