Initialize auto-download disabled for local feeds

2 files changed, 14 insertions, 2 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/LocalFeedUpdater.java b/core/src/main/java/de/danoeh/antennapod/core/feed/LocalFeedUpdater.java
index 706aed2c3..7ebb8633b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/LocalFeedUpdater.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/LocalFeedUpdater.java
@@ -18,6 +18,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 
 import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
@@ -89,6 +90,15 @@ public class LocalFeedUpdater {
             // set default feed image
             feed.setImageUrl(getDefaultIconUrl(context));
         }
+        if (feed.getPreferences().getAutoDownload()) {
+            feed.getPreferences().setAutoDownload(false);
+            feed.getPreferences().setAutoDeleteAction(FeedPreferences.AutoDeleteAction.NO);
+            try {
+                DBWriter.setFeedPreferences(feed.getPreferences()).get();
+            } catch (ExecutionException | InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
 
         // update items, delete items without existing file;
         // only delete items if the folder contains at least one element to avoid accidentally
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 9359774e9..477a39968 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
@@ -478,11 +478,11 @@ public final class DBTasks {
             resultFeed = savedFeed;
         }
 
-        adapter.close();
-
         try {
             if (savedFeed == null) {
                 DBWriter.addNewFeed(context, newFeed).get();
+                // Update with default values that are set in database
+                resultFeed = searchFeedByIdentifyingValueOrID(adapter, newFeed);
             } else {
                 DBWriter.setCompleteFeed(savedFeed).get();
             }
@@ -493,6 +493,8 @@ public final class DBTasks {
             e.printStackTrace();
         }
 
+        adapter.close();
+
         if (savedFeed != null) {
             EventBus.getDefault().post(new FeedListUpdateEvent(savedFeed));
         } else {