From 02792c5a6f65adaeef5b501fc640fa718d51cafa Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Mon, 25 Mar 2024 14:27:16 -0400
Subject: [PATCH] Remove extraneous time unit conversion.

---
 .../securesms/mediasend/MediaUploadRepository.java    |  3 +++
 .../securesms/mediasend/v2/MediaSelectionViewModel.kt | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java
index 7dd440a3aa..2d3b6bfe7e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java
@@ -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());
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 9796331d93..bd711932f4 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
@@ -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(