Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clamp videos to max duration after media quality change.

Browse Source 
Fixes #13930
Resolves #13932
This commit is contained in:
Sagar
2025-01-22 17:00:03 +05:30
committed by Greyson Parrelli
parent 4369591966
commit 119ee9666d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt
View File

@@ -335,6 +335,14 @@ class MediaSelectionViewModel(
store.update { it.copy(quality = sentMediaQuality, isPreUploadEnabled = false) } store.update { it.copy(quality = sentMediaQuality, isPreUploadEnabled = false) }
repository.uploadRepository.cancelAllUploads() repository.uploadRepository.cancelAllUploads()
store.state.selectedMedia.forEach { mediaItem ->
if (MediaUtil.isVideoType(mediaItem.contentType) && MediaConstraints.isVideoTranscodeAvailable()) {
val uri = mediaItem.uri
val data = store.state.getOrCreateVideoTrimData(uri)
onEditVideoDuration(totalDurationUs = data.totalInputDurationUs, startTimeUs = data.startTimeUs, endTimeUs = data.endTimeUs, touchEnabled = true, uri = uri)
}
}
} }
fun setMessage(text: CharSequence?) { fun setMessage(text: CharSequence?) {
@@ -345,9 +353,9 @@ class MediaSelectionViewModel(
store.update { it.copy(viewOnceToggleState = it.viewOnceToggleState.next()) } store.update { it.copy(viewOnceToggleState = it.viewOnceToggleState.next()) }
} }
fun onEditVideoDuration(totalDurationUs: Long, startTimeUs: Long, endTimeUs: Long, touchEnabled: Boolean) { fun onEditVideoDuration(totalDurationUs: Long, startTimeUs: Long, endTimeUs: Long, touchEnabled: Boolean, uri: Uri? = store.state.focusedMedia?.uri) {
if (uri == null) return
store.update { store.update {
val uri = it.focusedMedia?.uri ?: return@update it
val data = it.getOrCreateVideoTrimData(uri) val data = it.getOrCreateVideoTrimData(uri)
val clampedStartTime = max(startTimeUs, 0) val clampedStartTime = max(startTimeUs, 0)