Ensure videos are paused properly in MediaSendActivity.

signalapp · Oct 18, 2019 · 096c9e0 · 096c9e0
1 parent 2f23a13
commit 096c9e0
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 0 deletions.
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
@@ -82,9 +82,17 @@ public void onHiddenChanged(boolean hidden) {
     super.onHiddenChanged(hidden);
     if (!hidden) {
       viewModel.onImageEditorStarted();
+    } else {
+      fragmentPagerAdapter.notifyHidden();
     }
   }
 
+  @Override
+  public void onPause() {
+    super.onPause();
+    fragmentPagerAdapter.notifyHidden();
+  }
+
   @Override
   public void onStop() {
     super.onStop();
@@ -143,6 +151,7 @@ private class FragmentPageChangeListener extends ViewPager.SimpleOnPageChangeLis
     @Override
     public void onPageSelected(int position) {
       viewModel.onPageChanged(position);
+      fragmentPagerAdapter.notifyPageChanged(position);
     }
   }
 }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java
@@ -9,6 +9,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.annimon.stream.Stream;
+
 import org.thoughtcrime.securesms.scribbles.ImageEditorFragment;
 import org.thoughtcrime.securesms.util.MediaUtil;
 
@@ -119,4 +121,21 @@ void restoreState(@NonNull Map<Uri, Object> state) {
   @Nullable View getPlaybackControls(int position) {
     return fragments.containsKey(position) ? fragments.get(position).getPlaybackControls() : null;
   }
+
+  void notifyHidden() {
+    Stream.of(fragments.values()).forEach(MediaSendPageFragment::notifyHidden);
+  }
+
+  void notifyPageChanged(int currentPage) {
+    notifyHiddenIfExists(currentPage - 1);
+    notifyHiddenIfExists(currentPage + 1);
+  }
+
+  private void notifyHiddenIfExists(int position) {
+    MediaSendPageFragment fragment = fragments.get(position);
+
+    if (fragment != null) {
+      fragment.notifyHidden();
+    }
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java
@@ -65,4 +65,8 @@ public void setUri(@NonNull Uri uri) {
 
   @Override
   public void restoreState(@NonNull Object state) { }
+
+  @Override
+  public void notifyHidden() {
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java
@@ -19,4 +19,6 @@ public interface MediaSendPageFragment {
   @Nullable Object saveState();
 
   void restoreState(@NonNull Object state);
+
+  void notifyHidden();
 }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java
@@ -59,6 +59,19 @@ public void onDestroyView() {
     }
   }
 
+  @Override
+  public void onPause() {
+    super.onPause();
+    notifyHidden();
+  }
+
+  @Override
+  public void onHiddenChanged(boolean hidden) {
+    if (hidden) {
+      notifyHidden();
+    }
+  }
+
   @Override
   public void setUri(@NonNull Uri uri) {
     this.uri = uri;
@@ -82,4 +95,11 @@ public void setUri(@NonNull Uri uri) {
 
   @Override
   public void restoreState(@NonNull Object state) { }
+
+  @Override
+  public void notifyHidden() {
+    if (getView() != null) {
+      ((VideoPlayer) getView()).pause();
+    }
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
@@ -212,6 +212,10 @@ public void restoreState(@NonNull Object state) {
     }
   }
 
+  @Override
+  public void notifyHidden() {
+  }
+
   private void changeEntityColor(int selectedColor) {
     if (currentSelection != null) {
       Renderer renderer = currentSelection.getRenderer();