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

Remove extraneous time unit conversion.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-03-25 14:27:16 -04:00
parent 303929090b
commit 02792c5a6f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java
View File

@@ -108,6 +108,7 @@ public class MediaUploadRepository {
}
public void cancelUpload(@NonNull Collection<Media> mediaItems) {
Log.d(TAG, "Canceling uploads.");
executor.execute(() -> {
for (Media media : mediaItems) {
cancelUploadInternal(media);
@@ -116,6 +117,7 @@ public class MediaUploadRepository {
}
public void cancelAllUploads() {
Log.d(TAG, "Canceling all uploads.");
executor.execute(() -> {
for (Media media : new HashSet<>(uploadResults.keySet())) {
cancelUploadInternal(media);
@@ -159,6 +161,7 @@ public class MediaUploadRepository {
PreUploadResult result = uploadResults.get(media);
if (result != null) {
Log.d(TAG, "Canceling upload jobs for " + result.getJobIds().size() + " media items.");
Stream.of(result.getJobIds()).forEach(jobManager::cancel);
uploadResults.remove(media);
SignalDatabase.attachments().deleteAttachment(result.getAttachmentId());

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

@@ -344,7 +344,7 @@ class MediaSelectionViewModel(
store.update {
val uri = it.focusedMedia?.uri ?: return@update it
val data = it.getOrCreateVideoTrimData(uri)
val clampedStartTime = max(startTimeUs.toDouble(), 0.0).toLong()
val clampedStartTime = max(startTimeUs, 0)
val unedited = !data.isDurationEdited
val durationEdited = clampedStartTime > 0 || endTimeUs < totalDurationUs
@@ -356,8 +356,15 @@ class MediaSelectionViewModel(
it.transcodingPreset.calculateMaxVideoUploadDurationInSeconds(getMediaConstraints().getVideoMaxSize(context)).seconds.inWholeMicroseconds
}
val preserveStartTime = unedited || !endMoved
val updatedData = clampToMaxClipDuration(VideoTrimData(durationEdited, totalDurationUs, clampedStartTime, endTimeUs), maxVideoDurationUs, preserveStartTime)
val videoTrimData = VideoTrimData(durationEdited, totalDurationUs, clampedStartTime, endTimeUs)
val updatedData = clampToMaxClipDuration(videoTrimData, maxVideoDurationUs, preserveStartTime)
if (updatedData != videoTrimData) {
Log.d(TAG, "Video trim clamped from ${videoTrimData.startTimeUs}, ${videoTrimData.endTimeUs} to ${updatedData.startTimeUs}, ${updatedData.endTimeUs}")
}
if (unedited && durationEdited) {
Log.d(TAG, "Canceling upload because the duration has been edited for the first time..")
cancelUpload(MediaBuilder.buildMedia(uri))
}
it.copy(