Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize auto-download disabled for local feeds

Browse Source
This commit is contained in:
ByteHamster 2020-09-13 23:40:16 +02:00
parent 401da0a207
commit bce1fb9513
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/de/danoeh/antennapod/core/feed/LocalFeedUpdater.java
View File

@ -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

6
core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
View File

@ -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 {