Refactoring: Remove callback functions with constant value

4 files changed, 3 insertions, 21 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/DownloadServiceCallbacks.java b/core/src/main/java/de/danoeh/antennapod/core/DownloadServiceCallbacks.java
index ad3fb8d42..ae9b47629 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/DownloadServiceCallbacks.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/DownloadServiceCallbacks.java
@@ -37,7 +37,7 @@ public interface DownloadServiceCallbacks {
      * <p/>
      * The PendingIntent takes users to an activity where they can look at all successful and failed downloads.
      *
-     * @return A non-null PendingIntent for the notification or null if shouldCreateReport()==false
+     * @return A non-null PendingIntent for the notification
      */
     PendingIntent getReportNotificationContentIntent(Context context);
 
@@ -47,14 +47,8 @@ public interface DownloadServiceCallbacks {
      * <p/>
      * The PendingIntent takes users to an activity where they can look at their episode queue.
      *
-     * @return A non-null PendingIntent for the notification or null if shouldCreateReport()==false
+     * @return A non-null PendingIntent for the notification
      */
     PendingIntent getAutoDownloadReportNotificationContentIntent(Context context);
-
-    /**
-     * Returns true if the DownloadService should create a report that shows the number of failed
-     * downloads when the service shuts down.
-     */
-    boolean shouldCreateReport();
 }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java b/core/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java
index 194ee65ae..3dcaac4dc 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java
@@ -19,11 +19,4 @@ public interface PlaybackServiceCallbacks {
      * @return A non-null activity intent.
      */
     Intent getPlayerActivityIntent(Context context, MediaType mediaType, boolean remotePlayback);
-
-    /**
-     * Returns true if the PlaybackService should load new episodes from the queue when playback ends
-     * and false if the PlaybackService should ignore the queue and load no more episodes when playback
-     * finishes.
-     */
-    boolean useQueue();
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index a0e1a7041..2fe0aa8a5 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -205,8 +205,7 @@ public class DownloadService extends Service {
         isRunning = false;
 
         boolean showAutoDownloadReport = UserPreferences.showAutoDownloadReport();
-        if (ClientConfig.downloadServiceCallbacks.shouldCreateReport()
-                && (UserPreferences.showDownloadReport() || showAutoDownloadReport)) {
+        if (UserPreferences.showDownloadReport() || showAutoDownloadReport) {
             notificationManager.updateReport(reportQueue, showAutoDownloadReport);
             reportQueue.clear();
         }
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 69b35bff5..92fd9cb55 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
@@ -973,10 +973,6 @@ public class PlaybackService extends MediaBrowserServiceCompat {
             Log.d(TAG, "getNextInQueue(), but playable not an instance of FeedMedia, so not proceeding");
             return null;
         }
-        if (!ClientConfig.playbackServiceCallbacks.useQueue()) {
-            Log.d(TAG, "getNextInQueue(), but queue not in use by this app");
-            return null;
-        }
         Log.d(TAG, "getNextInQueue()");
         FeedMedia media = (FeedMedia) currentMedia;
         try {