empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Clamp start time value to be >= 0

Browse source
This commit is contained in:
Alex Hart 2021-09-08 16:51:04 -03:00 • committed by Greyson Parrelli
parent 1f7b1d91c4
commit 6e1657b1bd
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.java
View file

@ -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);
}