Skip to content

Commit 5d881e8

Browse files
authored
Merge branch 'develop' into feature/bma/customPushGateway
2 parents 3c5bc36 + 54ab4d2 commit 5d881e8

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
4545
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
4646
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
4747
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
48-
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStickerContent
4948
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
5049
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
5150
import io.element.android.features.messages.impl.timeline.model.event.duration
@@ -379,19 +378,6 @@ class MessagesFlowNode @AssistedInject constructor(
379378
thumbnailSource = event.content.thumbnailSource,
380379
)
381380
}
382-
is TimelineItemStickerContent -> {
383-
/* Sticker may have an empty url and no thumbnail
384-
if encrypted on certain bridges */
385-
event.content.preferredMediaSource?.let { preferredMediaSource ->
386-
buildMediaViewerNavTarget(
387-
mode = MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos(timelineMode),
388-
event = event,
389-
content = event.content,
390-
mediaSource = preferredMediaSource,
391-
thumbnailSource = event.content.thumbnailSource,
392-
)
393-
}
394-
}
395381
is TimelineItemVideoContent -> {
396382
buildMediaViewerNavTarget(
397383
mode = MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos(timelineMode),

libraries/pushproviders/firebase/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ dependencies {
7474
testImplementation(libs.test.truth)
7575
testImplementation(libs.test.turbine)
7676
testImplementation(libs.test.robolectric)
77+
testImplementation(libs.kotlinx.collections.immutable)
7778
testImplementation(projects.features.enterprise.test)
7879
testImplementation(projects.libraries.matrix.test)
7980
testImplementation(projects.libraries.push.test)

libraries/pushproviders/unifiedpush/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ dependencies {
4949
testImplementation(libs.test.robolectric)
5050
testImplementation(libs.test.truth)
5151
testImplementation(libs.test.turbine)
52+
testImplementation(libs.kotlinx.collections.immutable)
5253
testImplementation(projects.features.enterprise.test)
5354
testImplementation(projects.libraries.matrix.test)
5455
testImplementation(projects.libraries.push.test)

0 commit comments

Comments
 (0)