From 62f9f1954095d7a0df1557169c99f5e01a56eade Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 15 Oct 2021 11:14:32 -0300
Subject: [PATCH] Do not autoplay in video editor.

---
 .../mediasend/VideoEditorFragment.java        | 25 +++++++++++++++----
 .../securesms/video/VideoPlayer.java          | 11 ++++++++
 2 files changed, 31 insertions(+), 5 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 7aefc556f..b22a28d7c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.java
@@ -45,6 +45,8 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
             private VideoPlayer    player;
   @Nullable private VideoEditorHud hud;
             private Runnable       updatePosition;
+            private boolean        isInEdit;
+            private boolean        wasPlayingBeforeEdit;
 
   public static VideoEditorFragment newInstance(@NonNull Uri uri, long maxCompressedVideoSize, long maxAttachmentSize, boolean isVideoGif) {
     Bundle args = new Bundle();
@@ -88,9 +90,10 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
     long       maxOutput  = requireArguments().getLong(KEY_MAX_OUTPUT);
     long       maxSend    = requireArguments().getLong(KEY_MAX_SEND);
     VideoSlide slide      = new VideoSlide(requireContext(), uri, 0, isVideoGif);
+    boolean    autoplay   = isVideoGif;
 
     player.setWindow(requireActivity().getWindow());
-    player.setVideoSource(slide, true);
+    player.setVideoSource(slide, autoplay);
 
     if (slide.isVideoGif()) {
       player.setPlayerCallback(new VideoPlayer.PlayerCallback() {
@@ -116,7 +119,7 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
       hud.setEventListener(this);
       updateHud(data);
       if (data.durationEdited) {
-        player.clip(data.startTimeUs, data.endTimeUs, true);
+        player.clip(data.startTimeUs, data.endTimeUs, autoplay);
       }
       try {
         hud.setVideoSource(slide, new VideoBitRateCalculator(maxOutput), maxSend);
@@ -134,8 +137,12 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
       player.setPlayerCallback(new VideoPlayer.PlayerCallback() {
 
         @Override
-        public void onPlaying() {
+        public void onReady() {
           controller.onPlayerReady();
+        }
+
+        @Override
+        public void onPlaying() {
           hud.fadePlayButton();
         }
 
@@ -279,7 +286,11 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
     data.endTimeUs       = endTimeUs;
 
     if (editingComplete) {
+      isInEdit = false;
       videoScanThrottle.clear();
+    } else if (!isInEdit) {
+      isInEdit = true;
+      wasPlayingBeforeEdit = player.isPlaying();
     }
 
     videoScanThrottle.publish(() -> {
@@ -290,9 +301,13 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
       player.setPlaybackPosition(fromEdited || editingComplete ? clampedStartTime / 1000 : endTimeUs / 1000);
       if (editingComplete) {
         if (durationEdited) {
-          player.clip(clampedStartTime, endTimeUs, true);
+          player.clip(clampedStartTime, endTimeUs, wasPlayingBeforeEdit);
         } else {
-          player.removeClip(true);
+          player.removeClip(wasPlayingBeforeEdit);
+        }
+
+        if (!wasPlayingBeforeEdit) {
+          hud.showPlayButton();
         }
       }
     });
diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
index 1d52f69e4..a2101ac1d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
@@ -93,6 +93,7 @@ public class VideoPlayer extends FrameLayout {
         if (playerCallback != null) {
           switch (playbackState) {
             case Player.STATE_READY:
+              playerCallback.onReady();
               if (playWhenReady) playerCallback.onPlaying();
               break;
             case Player.STATE_ENDED:
@@ -137,6 +138,14 @@ public class VideoPlayer extends FrameLayout {
     exoView.setResizeMode(resizeMode);
   }
 
+  public boolean isPlaying() {
+    if (this.exoPlayer != null) {
+      return this.exoPlayer.isPlaying();
+    } else {
+      return false;
+    }
+  }
+
   public void pause() {
     if (this.exoPlayer != null) {
       this.exoPlayer.setPlayWhenReady(false);
@@ -332,6 +341,8 @@ public class VideoPlayer extends FrameLayout {
 
   public interface PlayerCallback {
 
+    default void onReady() {}
+
     void onPlaying();
 
     void onStopped();