Merge pull request #1214 from TomHennen/update_playback_notification

Update playback notification

3 files changed, 38 insertions, 33 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
index 133d4152a..96bcd6452 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
@@ -183,7 +183,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
 
@@ -252,7 +252,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
         };
@@ -324,7 +324,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
         };
@@ -397,7 +397,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
 
@@ -464,7 +464,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
 
@@ -532,7 +532,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
         };
@@ -602,7 +602,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
         };
@@ -675,7 +675,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
         };
@@ -713,9 +713,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
         }
 
         @Override
-        public boolean onMediaPlayerInfo(int code) {
-            return false;
-        }
+        public boolean onMediaPlayerInfo(int code) { return false; }
 
         @Override
         public boolean onMediaPlayerError(Object inObj, int what, int extra) {
@@ -723,7 +721,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
         }
 
         @Override
-        public boolean endPlayback(boolean playNextEpisode) {
+        public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
             return false;
         }
     };
@@ -795,7 +793,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
         };
@@ -901,7 +899,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
         };
@@ -982,7 +980,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
         };
@@ -1076,7 +1074,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             }
 
             @Override
-            public boolean endPlayback(boolean playNextEpisode) {
+            public boolean endPlayback(boolean playNextEpisode, boolean wasSkipped) {
                 return false;
             }
         };
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 634c3c546..85e0e45ca 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -141,26 +141,12 @@ public class ExternalPlayerFragment extends Fragment {
 
             @Override
             public void onShutdownNotification() {
-                if (fragmentLayout != null) {
-                    fragmentLayout.setVisibility(View.GONE);
-                }
-                controller = setupPlaybackController();
-                if (butPlay != null) {
-                    butPlay.setOnClickListener(controller
-                            .newOnPlayButtonClickListener());
-                }
+                playbackDone();
             }
 
             @Override
             public void onPlaybackEnd() {
-                if (fragmentLayout != null) {
-                    fragmentLayout.setVisibility(View.GONE);
-                }
-                controller = setupPlaybackController();
-                if (butPlay != null) {
-                    butPlay.setOnClickListener(controller
-                            .newOnPlayButtonClickListener());
-                }
+                playbackDone();
             }
 
             @Override
@@ -192,6 +178,21 @@ public class ExternalPlayerFragment extends Fragment {
         }
     }
 
+    private void playbackDone() {
+        if (fragmentLayout != null) {
+            fragmentLayout.setVisibility(View.GONE);
+        }
+        if (controller != null) {
+            controller.release();
+        }
+        controller = setupPlaybackController();
+        if (butPlay != null) {
+            butPlay.setOnClickListener(controller
+                    .newOnPlayButtonClickListener());
+        }
+        controller.init();
+    }
+
     private boolean loadMediaInfo() {
         Log.d(TAG, "Loading media info");
         if (controller != null && controller.serviceAvailable()) {
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index af20eddfd..30381162c 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -83,7 +83,7 @@
             android:summary="@string/pref_unpauseOnHeadsetReconnect_sum"
             android:title="@string/pref_unpauseOnHeadsetReconnect_title"/>
         <CheckBoxPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:enabled="true"
             android:key="prefFollowQueue"
             android:summary="@string/pref_followQueue_sum"
@@ -91,6 +91,12 @@
         <CheckBoxPreference
             android:defaultValue="false"
             android:enabled="true"
+            android:key="prefSkipRemovesFromQueue"
+            android:summary="@string/pref_skip_removes_from_queue_sum"
+            android:title="@string/pref_skip_removes_from_queue_title"/>
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
             android:key="prefAutoDelete"
             android:summary="@string/pref_auto_delete_sum"
             android:title="@string/pref_auto_delete_title"/>