From 471bf853c81bf4877ec6274dd6a6e2e1bdce2106 Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Tue, 29 Nov 2022 01:41:31 +0100 Subject: [PATCH] Remove voice broadcast chunks from the room attachments list --- .../detail/timeline/helper/TimelineEventVisibilityHelper.kt | 3 +-- .../app/features/roomprofile/uploads/RoomUploadsViewModel.kt | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt index 1360151074..382f1c2301 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt @@ -22,7 +22,6 @@ import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants import im.vector.app.features.voicebroadcast.isVoiceBroadcast import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent -import org.matrix.android.sdk.api.extensions.orFalse import org.matrix.android.sdk.api.session.events.model.Event import org.matrix.android.sdk.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.RelationType @@ -257,7 +256,7 @@ class TimelineEventVisibilityHelper @Inject constructor( return true } - if (root.asMessageAudioEvent()?.isVoiceBroadcast().orFalse()) { + if (root.asMessageAudioEvent().isVoiceBroadcast()) { return true } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt index 87dff2f00b..a71490f4a7 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt @@ -26,10 +26,12 @@ import dagger.assisted.AssistedInject import im.vector.app.core.di.MavericksAssistedViewModelFactory import im.vector.app.core.di.hiltMavericksViewModelFactory import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.voicebroadcast.isVoiceBroadcast import kotlinx.coroutines.launch import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.getRoom import org.matrix.android.sdk.api.session.room.model.message.MessageType +import org.matrix.android.sdk.api.session.room.model.message.asMessageAudioEvent import org.matrix.android.sdk.flow.flow import org.matrix.android.sdk.flow.unwrap @@ -78,6 +80,8 @@ class RoomUploadsViewModel @AssistedInject constructor( token = result.nextToken val groupedUploadEvents = result.uploadEvents + // Remove voice broadcast chunks from the attachments + .filterNot { it.root.asMessageAudioEvent().isVoiceBroadcast() } .groupBy { it.contentWithAttachmentContent.msgType == MessageType.MSGTYPE_IMAGE || it.contentWithAttachmentContent.msgType == MessageType.MSGTYPE_VIDEO