bugfix - video playback upon press back button (and pause), playback notification might reappear if one swipes it away quickly.

1 files changed, 12 insertions, 0 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index d6983eac2..fa5012b74 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -47,6 +47,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
      */
     private boolean videoControlsShowing = true;
     private boolean videoSurfaceCreated = false;
+    private boolean playbackStoppedUponExitVideo = false;
     private boolean destroyingDueToReload = false;
 
     private VideoControlsHider videoControlsHider = new VideoControlsHider(this);
@@ -77,6 +78,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     protected void onResume() {
         super.onResume();
+        playbackStoppedUponExitVideo = false;
         if (TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
             playExternalMedia(getIntent(), MediaType.VIDEO);
         } else if (PlaybackService.isCasting()) {
@@ -99,6 +101,16 @@ public class VideoplayerActivity extends MediaplayerActivity {
     }
 
     void stopPlaybackIfUserPreferencesSpecified() {
+        // to avoid the method being called twice during leaving Videoplayer
+        // , which will double-pause the media
+        // (it is usually first called by surfaceHolderCallback.surfaceDestroyed(),
+        //  then VideoplayerActivity.onStop() , but sometimes VideoplayerActivity.onStop()
+        //  will first be invoked.)
+        if (playbackStoppedUponExitVideo) {
+            return;
+        }
+        playbackStoppedUponExitVideo = true;
+
         if (controller != null && !destroyingDueToReload
                 && UserPreferences.getVideoBackgroundBehavior()
                 != UserPreferences.VideoBackgroundBehavior.CONTINUE_PLAYING) {