2 files changed, 25 insertions, 16 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/APSPCleanupAlgorithm.java b/core/src/main/java/de/danoeh/antennapod/core/storage/APSPCleanupAlgorithm.java
index b53645d93..420bbc09d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/APSPCleanupAlgorithm.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/APSPCleanupAlgorithm.java
@@ -13,7 +13,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.feed.FeedItem;
 
 /**
@@ -39,7 +38,7 @@ public class APSPCleanupAlgorithm implements EpisodeCleanupAlgorithm<Integer> {
      */
     @Override
     public int performCleanup(Context context, Integer episodeSize) {
-        if (BuildConfig.DEBUG) Log.d(TAG, String.format("performAutoCleanup(%d)", episodeSize));
+        Log.i(TAG, String.format("performAutoCleanup(%d)", episodeSize));
         if (episodeSize <= 0) {
             return 0;
         }
@@ -64,20 +63,25 @@ public class APSPCleanupAlgorithm implements EpisodeCleanupAlgorithm<Integer> {
         });
         // listened episodes will be deleted first
         Iterator<FeedItem> it = candidates.iterator();
-        for (FeedItem i = it.next(); it.hasNext() && deletedEpisodesSize <= episodeSize; i = it.next()) {
-            if (!i.getMedia().isPlaying() && i.getMedia().getPlaybackCompletionDate() != null) {
-                it.remove();
-                deleteList.add(i);
-                deletedEpisodesSize += i.getMedia().getSize();
+        if (it.hasNext()) {
+            for (FeedItem i = it.next(); it.hasNext() && deletedEpisodesSize <= episodeSize; i = it.next()) {
+                if (!i.getMedia().isPlaying() && i.getMedia().getPlaybackCompletionDate() != null) {
+                    it.remove();
+                    deleteList.add(i);
+                    deletedEpisodesSize += i.getMedia().getSize();
+                }
             }
         }
+
         // delete unlistened old episodes if necessary
         it = candidates.iterator();
-        for (FeedItem i = it.next(); it.hasNext() && deletedEpisodesSize <= episodeSize; i = it.next()) {
-            if (!i.getMedia().isPlaying()) {
-                it.remove();
-                deleteList.add(i);
-                deletedEpisodesSize += i.getMedia().getSize();
+        if (it.hasNext()) {
+            for (FeedItem i = it.next(); it.hasNext() && deletedEpisodesSize <= episodeSize; i = it.next()) {
+                if (!i.getMedia().isPlaying()) {
+                    it.remove();
+                    deleteList.add(i);
+                    deletedEpisodesSize += i.getMedia().getSize();
+                }
             }
         }
         for (FeedItem item : deleteList) {
@@ -89,9 +93,8 @@ public class APSPCleanupAlgorithm implements EpisodeCleanupAlgorithm<Integer> {
                 e.printStackTrace();
             }
         }
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, String.format("performAutoCleanup(%d) deleted %d episodes and free'd %d bytes of memory",
-                    episodeSize, deleteList.size(), deletedEpisodesSize));
+        Log.i(TAG, String.format("performAutoCleanup(%d) deleted %d episodes and freed %d bytes of memory",
+                episodeSize, deleteList.size(), deletedEpisodesSize));
         return deleteList.size();
     }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/APSPDownloadAlgorithm.java b/core/src/main/java/de/danoeh/antennapod/core/storage/APSPDownloadAlgorithm.java
index feeca776e..f760ec0ce 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/APSPDownloadAlgorithm.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/APSPDownloadAlgorithm.java
@@ -3,6 +3,7 @@ package de.danoeh.antennapod.core.storage;
 import android.content.Context;
 import android.util.Log;
 
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -39,11 +40,16 @@ public class APSPDownloadAlgorithm implements AutomaticDownloadAlgorithm {
                     Log.d(TAG, "Performing auto-dl of undownloaded episodes");
                 if (NetworkUtils.autodownloadNetworkAvailable(context)
                         && UserPreferences.isEnableAutodownload()) {
+
+                    Arrays.sort(mediaIds);
                     List<FeedItem> itemsToDownload = DBReader.getRecentlyPublishedEpisodes(context,
                             numberOfNewAutomaticallyDownloadedEpisodes);
                     Iterator<FeedItem> it = itemsToDownload.iterator();
+
                     for (FeedItem item = it.next(); it.hasNext(); item = it.next()) {
-                        if (item.getMedia().isDownloaded()) {
+                        if (!item.hasMedia()
+                                || item.getMedia().isDownloaded()
+                                || Arrays.binarySearch(mediaIds, item.getMedia().getId()) < 0) {
                             it.remove();
                         }
                     }