2 files changed, 29 insertions, 14 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 78cc15b2c..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()) {
@@ -91,12 +93,32 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     @Override
     protected void onStop() {
+        stopPlaybackIfUserPreferencesSpecified(); // MUST be called before super.onStop(), while it still has member variable controller
         super.onStop();
         if (!PictureInPictureUtil.isInPictureInPictureMode(this)) {
             videoControlsHider.stop();
         }
     }
 
+    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) {
+            Log.v(TAG, "stop video playback per UserPreference");
+            controller.notifyVideoSurfaceAbandoned();
+        }
+    }
+
     @Override
     public void onUserLeaveHint () {
         if (!PictureInPictureUtil.isInPictureInPictureMode(this) && UserPreferences.getVideoBackgroundBehavior()
@@ -275,13 +297,12 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
         @Override
         public void surfaceDestroyed(SurfaceHolder holder) {
-            Log.d(TAG, "Videosurface was destroyed");
+            Log.d(TAG, "Videosurface was destroyed." );
+            Log.v(TAG, "    hasController=" + (controller != null)
+                    + " , destroyingDueToReload=" + destroyingDueToReload
+                    + " , videoBackgroundBehavior=" + UserPreferences.getVideoBackgroundBehavior());
             videoSurfaceCreated = false;
-            if (controller != null && !destroyingDueToReload
-                    && UserPreferences.getVideoBackgroundBehavior()
-                    != UserPreferences.VideoBackgroundBehavior.CONTINUE_PLAYING) {
-                controller.notifyVideoSurfaceAbandoned();
-            }
+            stopPlaybackIfUserPreferencesSpecified();
         }
     };
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
index 1286d9dc7..f54b9266e 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -1,8 +1,6 @@
 package de.danoeh.antennapod.adapter;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.content.Intent;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -30,7 +28,7 @@ import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
  */
 public class DefaultActionButtonCallback implements ActionButtonCallback {
 
-    private static final String TAG = "DefaultActionButtonCallback";
+    private static final String TAG = "DefaultActionBtnCb";
 
     private final Context context;
 
@@ -84,13 +82,9 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
                 }
             } else { // media is downloaded
                 if (media.isCurrentlyPlaying()) {
-                    new PlaybackServiceStarter(context, media)
-                            .startWhenPrepared(true)
-                            .shouldStream(false)
-                            .start();
                     IntentUtils.sendLocalBroadcast(context, PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE);
                 } else if (media.isCurrentlyPaused()) {
-                    new PlaybackServiceStarter(context, media)
+                    new PlaybackServiceStarter(context, media) // need to start the service in case it's been stopped by system.
                             .startWhenPrepared(true)
                             .shouldStream(false)
                             .start();