Merge branch 'develop' of github.com:AntennaPod/AntennaPod into develop

3 files changed, 15 insertions, 9 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index aa3bbaeab..2221da2e7 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -74,6 +74,7 @@ public class UserPreferences {
     public static final String PREF_RESUME_AFTER_CALL = "prefResumeAfterCall";
 
     // Network
+    public static final String PREF_ENQUEUE_DOWNLOADED = "prefEnqueueDownloaded";
     public static final String PREF_UPDATE_INTERVAL = "prefAutoUpdateIntervall";
     public static final String PREF_MOBILE_UPDATE = "prefMobileUpdate";
     public static final String PREF_EPISODE_CLEANUP = "prefEpisodeCleanup";
@@ -258,11 +259,10 @@ public class UserPreferences {
         return prefs.getBoolean(PREF_SHOW_DOWNLOAD_REPORT, true);
     }
 
-    /**
-     * Returns {@code true} if new queue elements are added to the front
-     *
-     * @return {@code true} if new queue elements are added to the front; {@code false}  otherwise
-     */
+    public static boolean enqueueDownloadedEpisodes() {
+        return prefs.getBoolean(PREF_ENQUEUE_DOWNLOADED, true);
+    }
+
     public static boolean enqueueAtFront() {
         return prefs.getBoolean(PREF_QUEUE_ADD_TO_FRONT, false);
     }
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 6bd9fc83c..9ac459394 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
@@ -842,11 +842,14 @@ public class DownloadService extends Service {
                 successful = false;
                 reason = DownloadError.ERROR_PARSER_EXCEPTION;
                 reasonDetailed = e.getMessage();
+            } finally {
+                File feedFile = new File(request.getDestination());
+                if(feedFile.exists()) {
+                    boolean deleted = feedFile.delete();
+                    Log.d(TAG, "Deletion of file '" + feedFile.getAbsolutePath() + "' " + (deleted ? "successful" : "FAILED"));
+                }
             }
 
-            // cleanup();
-
-
             if (successful) {
                 // we create a 'successful' download log if the feed's last refresh failed
                 List<DownloadStatus> log = DBReader.getFeedDownloadLog(feed);
@@ -1048,7 +1051,8 @@ public class DownloadService extends Service {
 
                 DBWriter.setFeedMedia(media).get();
 
-                if (item != null && !DBTasks.isInQueue(DownloadService.this, item.getId())) {
+                if (item != null && UserPreferences.enqueueDownloadedEpisodes() &&
+                        !DBTasks.isInQueue(DownloadService.this, item.getId())) {
                     DBWriter.addQueueItem(DownloadService.this, item).get();
                 }
             } catch (ExecutionException | InterruptedException e) {
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 96350e19f..bed7b443c 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -421,6 +421,8 @@
     <string name="pref_cast_title">Chromecast support</string>
     <string name="pref_cast_message_play_flavor">Enable support for remote media playback on Cast devices (such as Chromecast, Audio Speakers or Android TV)</string>
     <string name="pref_cast_message_free_flavor">Chromecast requires third party proprietary libraries that are disabled in this version of AntennaPod</string>
+    <string name="pref_enqueue_downloaded_title">Enqueue Dowloaded</string>
+    <string name="pref_enqueue_downloaded_summary">Add downloaded episodes to the queue</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>