diff options
author | ByteHamster <ByteHamster@users.noreply.github.com> | 2020-11-11 21:56:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-11 21:56:08 +0100 |
commit | 95f020ab6294ff16a9783590dfcdd0bdde000306 (patch) | |
tree | dddb7424202965d21183db47180bce297509e209 | |
parent | 240e791d5113d2c32e43dc4883b0cd319d1a239d (diff) | |
parent | 2249e915781fd9f928b01858845b2de3fc984e72 (diff) | |
download | AntennaPod-95f020ab6294ff16a9783590dfcdd0bdde000306.zip |
Merge pull request #4678 from ByteHamster/update-local-folder-properties
Update local folder properties on refresh
3 files changed, 8 insertions, 10 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java index 9ecfda23e..28456c01e 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java @@ -191,7 +191,6 @@ public class AddFeedFragment extends Fragment { throw new IllegalArgumentException("Unable to retrieve document tree"); } Feed dirFeed = new Feed(Feed.PREFIX_LOCAL_FOLDER + uri.toString(), null, documentFile.getName()); - dirFeed.setDescription(getString(R.string.local_feed_description)); dirFeed.setItems(Collections.emptyList()); dirFeed.setSortOrder(SortOrder.EPISODE_TITLE_A_Z); Feed fromDatabase = DBTasks.updateFeed(getContext(), dirFeed, false); 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 971808eb4..e1bad4d93 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 @@ -97,15 +97,11 @@ 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(); - } - } + + feed.getPreferences().setAutoDownload(false); + feed.getPreferences().setAutoDeleteAction(FeedPreferences.AutoDeleteAction.NO); + feed.setDescription(context.getString(R.string.local_feed_description)); + feed.setAuthor(context.getString(R.string.local_folder)); // 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/res/values/strings.xml b/core/src/main/res/values/strings.xml index 4e50dc065..1f013ccc7 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -741,7 +741,10 @@ <string name="discover_more">more ยป</string> <string name="discover_powered_by_itunes">Suggestions by iTunes</string> <string name="search_powered_by">Results by %1$s</string> + + <!-- Local feeds --> <string name="add_local_folder">Add local folder</string> + <string name="local_folder">Local folder</string> <string name="reconnect_local_folder">Re-connect local folder</string> <string name="reconnect_local_folder_warning">In case of permission denials, you can use this to re-connect to the exact same folder. Do not select another folder.</string> <string name="local_feed_description">This virtual podcast was created by adding a folder to AntennaPod.</string> |