From ed063b4b951c068c21ab83baea390991f1163eea Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 1 Jul 2022 12:42:55 -0300 Subject: [PATCH] Prevent pre-upload for videos that require clipping if stories is enabled. --- .../securesms/mediasend/v2/MediaSelectionViewModel.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt index c99212bf0d5..397553fb1fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt @@ -335,7 +335,13 @@ class MediaSelectionViewModel( return } - repository.uploadRepository.startUpload(media, store.state.recipient) + val filteredPreUploadMedia = if (Stories.isFeatureEnabled()) { + media.filterNot { Stories.MediaTransform.getSendRequirements(media) == Stories.MediaTransform.SendRequirements.REQUIRES_CLIP } + } else { + media + } + + repository.uploadRepository.startUpload(filteredPreUploadMedia, store.state.recipient) } private fun cancelUpload(media: Media) {