Using builder to call PlaybackService

4 files changed, 93 insertions, 25 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index dc67c0758..c1d3b6f1f 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -804,21 +804,6 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         }
     };
 
-    public static void startIfNotRunning(final Context context, final Playable media, boolean startWhenPrepared, boolean shouldStream) {
-        if (!isRunning) {
-            startService(context, media, startWhenPrepared, shouldStream);
-        }
-    }
-
-    public static void startService(final Context context, final Playable media, boolean startWhenPrepared, boolean shouldStream) {
-        Intent launchIntent = new Intent(context, PlaybackService.class);
-        launchIntent.putExtra(PlaybackService.EXTRA_PLAYABLE, media);
-        launchIntent.putExtra(PlaybackService.EXTRA_START_WHEN_PREPARED, startWhenPrepared);
-        launchIntent.putExtra(PlaybackService.EXTRA_SHOULD_STREAM, shouldStream);
-        launchIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY, true);
-        ContextCompat.startForegroundService(context, launchIntent);
-    }
-
     private Playable getNextInQueue(final Playable currentMedia) {
         if (!(currentMedia instanceof FeedMedia)) {
             Log.d(TAG, "getNextInQueue(), but playable not an instance of FeedMedia, so not proceeding");
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
index 02098e9ed..22a7b64fe 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
@@ -40,6 +40,7 @@ import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.comparator.FeedItemPubdateComparator;
 import de.danoeh.antennapod.core.util.exception.MediaFileNotFoundException;
 import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
+import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 
 import static android.content.Context.MODE_PRIVATE;
 
@@ -125,8 +126,13 @@ public final class DBTasks {
                             media);
                 }
             }
-            // Needs to be called even if the service is already running to deliver the new media intent
-            PlaybackService.startService(context, media, startWhenPrepared, shouldStream);
+
+            new PlaybackServiceStarter(context, media)
+                    .callEvenIfRunning(true)
+                    .startWhenPrepared(startWhenPrepared)
+                    .shouldStream(shouldStream)
+                    .start();
+
             if (showPlayer) {
                 // Launch media player
                 context.startActivity(PlaybackService.getPlayerActivityIntent(
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index 7c930a8e2..a3f02d5cc 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -221,18 +221,16 @@ public abstract class PlaybackController {
             return null;
         }
 
-        Intent serviceIntent = new Intent(activity, PlaybackService.class);
-        serviceIntent.putExtra(PlaybackService.EXTRA_PLAYABLE, media);
-        serviceIntent.putExtra(PlaybackService.EXTRA_START_WHEN_PREPARED, false);
-        serviceIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY, true);
         boolean fileExists = media.localFileAvailable();
         boolean lastIsStream = PlaybackPreferences.getCurrentEpisodeIsStream();
         if (!fileExists && !lastIsStream && media instanceof FeedMedia) {
             DBTasks.notifyMissingFeedMediaFile(activity, (FeedMedia) media);
         }
-        serviceIntent.putExtra(PlaybackService.EXTRA_SHOULD_STREAM,
-                lastIsStream || !fileExists);
-        return serviceIntent;
+
+        return new PlaybackServiceStarter(activity, media)
+                .startWhenPrepared(false)
+                .shouldStream(lastIsStream || !fileExists)
+                .getIntent();
     }
 
 
@@ -586,7 +584,10 @@ public abstract class PlaybackController {
 
     public void playPause() {
         if (playbackService == null) {
-            PlaybackService.startService(activity, media, true, false);
+            new PlaybackServiceStarter(activity, media)
+                    .startWhenPrepared(true)
+                    .streamIfLastWasStream()
+                    .start();
             Log.w(TAG, "Play/Pause button was pressed, but playbackservice was null!");
             return;
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackServiceStarter.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackServiceStarter.java
new file mode 100644
index 000000000..3ba553d12
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackServiceStarter.java
@@ -0,0 +1,76 @@
+package de.danoeh.antennapod.core.util.playback;
+
+import android.content.Context;
+import android.content.Intent;
+import android.media.MediaPlayer;
+import android.support.v4.content.ContextCompat;
+import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+
+public class PlaybackServiceStarter {
+    private final Context context;
+    private final Playable media;
+    private boolean startWhenPrepared = false;
+    private boolean shouldStream = false;
+    private boolean callEvenIfRunning = false;
+    private boolean prepareImmediately = true;
+
+    public PlaybackServiceStarter(Context context, Playable media) {
+        this.context = context;
+        this.media = media;
+    }
+
+    /**
+     * Default value: false
+     */
+    public PlaybackServiceStarter shouldStream(boolean shouldStream) {
+        this.shouldStream = shouldStream;
+        return this;
+    }
+
+    public PlaybackServiceStarter streamIfLastWasStream() {
+        boolean lastIsStream = PlaybackPreferences.getCurrentEpisodeIsStream();
+        return shouldStream(lastIsStream);
+    }
+
+    /**
+     * Default value: false
+     */
+    public PlaybackServiceStarter startWhenPrepared(boolean startWhenPrepared) {
+        this.startWhenPrepared = startWhenPrepared;
+        return this;
+    }
+
+    /**
+     * Default value: false
+     */
+    public PlaybackServiceStarter callEvenIfRunning(boolean callEvenIfRunning) {
+        this.callEvenIfRunning = callEvenIfRunning;
+        return this;
+    }
+
+    /**
+     * Default value: true
+     */
+    public PlaybackServiceStarter prepareImmediately(boolean prepareImmediately) {
+        this.prepareImmediately = prepareImmediately;
+        return this;
+    }
+
+    public Intent getIntent() {
+        Intent launchIntent = new Intent(context, PlaybackService.class);
+        launchIntent.putExtra(PlaybackService.EXTRA_PLAYABLE, media);
+        launchIntent.putExtra(PlaybackService.EXTRA_START_WHEN_PREPARED, startWhenPrepared);
+        launchIntent.putExtra(PlaybackService.EXTRA_SHOULD_STREAM, shouldStream);
+        launchIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY, prepareImmediately);
+
+        return launchIntent;
+    }
+
+    public void start() {
+        if (PlaybackService.isRunning && !callEvenIfRunning) {
+            return;
+        }
+        ContextCompat.startForegroundService(context, getIntent());
+    }
+}