From 6e1657b1bd6956c0758ef7518caa2ede4985e345 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 8 Sep 2021 16:51:04 -0300 Subject: [PATCH] Clamp start time value to be >= 0 --- .../securesms/mediasend/VideoEditorFragment.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.java index 323b7c41be..e404c68153 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.java @@ -252,12 +252,14 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even hud.hidePlayButton(); } + final long clampedStartTime = Math.max(startTimeUs, 0); + boolean wasEdited = data.durationEdited; - boolean durationEdited = startTimeUs > 0 || endTimeUs < totalDurationUs; + boolean durationEdited = clampedStartTime > 0 || endTimeUs < totalDurationUs; data.durationEdited = durationEdited; data.totalDurationUs = totalDurationUs; - data.startTimeUs = startTimeUs; + data.startTimeUs = clampedStartTime; data.endTimeUs = endTimeUs; if (editingComplete) { @@ -269,10 +271,10 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even if (!editingComplete) { player.removeClip(false); } - player.setPlaybackPosition(fromEdited || editingComplete ? startTimeUs / 1000 : endTimeUs / 1000); + player.setPlaybackPosition(fromEdited || editingComplete ? clampedStartTime / 1000 : endTimeUs / 1000); if (editingComplete) { if (durationEdited) { - player.clip(startTimeUs, endTimeUs, true); + player.clip(clampedStartTime, endTimeUs, true); } else { player.removeClip(true); }