From e3dcb683b8b084ebbd017a182028f1bd0331f5fd Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Wed, 12 Mar 2025 17:36:31 +0100 Subject: [PATCH 1/2] Fix warnings in tests for push provider modules (#4398) --- libraries/pushproviders/firebase/build.gradle.kts | 1 + libraries/pushproviders/unifiedpush/build.gradle.kts | 1 + 2 files changed, 2 insertions(+) diff --git a/libraries/pushproviders/firebase/build.gradle.kts b/libraries/pushproviders/firebase/build.gradle.kts index 044b930572..395006e47c 100644 --- a/libraries/pushproviders/firebase/build.gradle.kts +++ b/libraries/pushproviders/firebase/build.gradle.kts @@ -73,6 +73,7 @@ dependencies { testImplementation(libs.test.truth) testImplementation(libs.test.turbine) testImplementation(libs.test.robolectric) + testImplementation(libs.kotlinx.collections.immutable) testImplementation(projects.libraries.matrix.test) testImplementation(projects.libraries.push.test) testImplementation(projects.libraries.pushstore.test) diff --git a/libraries/pushproviders/unifiedpush/build.gradle.kts b/libraries/pushproviders/unifiedpush/build.gradle.kts index fd502263e9..03ddb68d17 100644 --- a/libraries/pushproviders/unifiedpush/build.gradle.kts +++ b/libraries/pushproviders/unifiedpush/build.gradle.kts @@ -48,6 +48,7 @@ dependencies { testImplementation(libs.test.robolectric) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) + testImplementation(libs.kotlinx.collections.immutable) testImplementation(projects.libraries.matrix.test) testImplementation(projects.libraries.push.test) testImplementation(projects.libraries.pushproviders.test) From 9695c180d89bf8554453b9c30009edf339f6a7b0 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 12 Mar 2025 18:23:52 +0100 Subject: [PATCH 2/2] Disable click effect on Stickers. Closes #4342 --- .../features/messages/impl/MessagesFlowNode.kt | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt index 2a84150540..f2befcb7c6 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt +++ b/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),