Merge branch 'develop' into feature/bma/customPushGateway

Author: bmarty

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt

@@ -45,7 +45,6 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStickerContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
 import io.element.android.features.messages.impl.timeline.model.event.duration
@@ -379,19 +378,6 @@ class MessagesFlowNode @AssistedInject constructor(
                     thumbnailSource = event.content.thumbnailSource,
                 )
             }
-            is TimelineItemStickerContent -> {
-                /* Sticker may have an empty url and no thumbnail
-                   if encrypted on certain bridges */
-                event.content.preferredMediaSource?.let { preferredMediaSource ->
-                    buildMediaViewerNavTarget(
-                        mode = MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos(timelineMode),
-                        event = event,
-                        content = event.content,
-                        mediaSource = preferredMediaSource,
-                        thumbnailSource = event.content.thumbnailSource,
-                    )
-                }
-            }
             is TimelineItemVideoContent -> {
                 buildMediaViewerNavTarget(
                     mode = MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos(timelineMode),

libraries/pushproviders/firebase/build.gradle.kts

@@ -74,6 +74,7 @@ dependencies {
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
     testImplementation(libs.test.robolectric)
+    testImplementation(libs.kotlinx.collections.immutable)
     testImplementation(projects.features.enterprise.test)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.push.test)

libraries/pushproviders/unifiedpush/build.gradle.kts

@@ -49,6 +49,7 @@ dependencies {
     testImplementation(libs.test.robolectric)
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
+    testImplementation(libs.kotlinx.collections.immutable)
     testImplementation(projects.features.enterprise.test)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.push.test)