remove ability to specify mediaIds when autodownloading

3 files changed, 11 insertions, 21 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java b/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
index c2e971dce..be9ae1157 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
@@ -29,12 +29,10 @@ public class APDownloadAlgorithm implements AutomaticDownloadAlgorithm {
      * This method is executed on an internal single thread executor.
      *
      * @param context  Used for accessing the DB.
-     * @param mediaIds If this list is not empty, the method will only download a candidate for automatic downloading if
-     *                 its media ID is in the mediaIds list.
      * @return A Runnable that will be submitted to an ExecutorService.
      */
     @Override
-    public Runnable autoDownloadUndownloadedItems(final Context context, final long... mediaIds) {
+    public Runnable autoDownloadUndownloadedItems(final Context context) {
         return new Runnable() {
             @Override
             public void run() {
@@ -53,17 +51,13 @@ public class APDownloadAlgorithm implements AutomaticDownloadAlgorithm {
                     Log.d(TAG, "Performing auto-dl of undownloaded episodes");
 
                     List<FeedItem> candidates;
-                    if(mediaIds.length > 0) {
-                        candidates = DBReader.getFeedItems(context, mediaIds);
-                    } else {
-                        final List<FeedItem> queue = DBReader.getQueue(context);
-                        final List<FeedItem> newItems = DBReader.getNewItemsList(context);
-                        candidates = new ArrayList<FeedItem>(queue.size() + newItems.size());
-                        candidates.addAll(queue);
-                        for(FeedItem newItem : newItems) {
-                            if(candidates.contains(newItem) == false) {
-                                candidates.add(newItem);
-                            }
+                    final List<FeedItem> queue = DBReader.getQueue(context);
+                    final List<FeedItem> newItems = DBReader.getNewItemsList(context);
+                    candidates = new ArrayList<FeedItem>(queue.size() + newItems.size());
+                    candidates.addAll(queue);
+                    for(FeedItem newItem : newItems) {
+                        if(candidates.contains(newItem) == false) {
+                            candidates.add(newItem);
                         }
                     }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/AutomaticDownloadAlgorithm.java b/core/src/main/java/de/danoeh/antennapod/core/storage/AutomaticDownloadAlgorithm.java
index 9ca9620a7..72c68ddb6 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/AutomaticDownloadAlgorithm.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/AutomaticDownloadAlgorithm.java
@@ -12,9 +12,7 @@ public interface AutomaticDownloadAlgorithm {
      * This method is executed on an internal single thread executor.
      *
      * @param context  Used for accessing the DB.
-     * @param mediaIds If this list is not empty, the method will only download a candidate for automatic downloading if
-     *                 its media ID is in the mediaIds list.
      * @return A Runnable that will be submitted to an ExecutorService.
      */
-    public Runnable autoDownloadUndownloadedItems(Context context, long... mediaIds);
+    public Runnable autoDownloadUndownloadedItems(Context context);
 }
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 5a3822a81..df9f3281a 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
@@ -374,14 +374,12 @@ public final class DBTasks {
      * This method is executed on an internal single thread executor.
      *
      * @param context  Used for accessing the DB.
-     * @param mediaIds If this list is not empty, the method will only download a candidate for automatic downloading if
-     *                 its media ID is in the mediaIds list.
      * @return A Future that can be used for waiting for the methods completion.
      */
-    public static Future<?> autodownloadUndownloadedItems(final Context context, final long... mediaIds) {
+    public static Future<?> autodownloadUndownloadedItems(final Context context) {
         Log.d(TAG, "autodownloadUndownloadedItems");
         return autodownloadExec.submit(ClientConfig.dbTasksCallbacks.getAutomaticDownloadAlgorithm()
-                .autoDownloadUndownloadedItems(context, mediaIds));
+                .autoDownloadUndownloadedItems(context));
 
     }