diff options
author | ByteHamster <ByteHamster@users.noreply.github.com> | 2021-03-04 12:12:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-04 12:12:53 +0100 |
commit | 8d8cae2decddeffeeb08a5444a66b115ebeaa7da (patch) | |
tree | 860aff97bdf0eaac900b8fc27e8af83104cafb27 /app/src/main/java | |
parent | fae32c4fee6e6dd4653abae22b3522f8f0d6174f (diff) | |
parent | dd8341a858f560f045f0d90c8c32f27d6a0891d4 (diff) | |
download | AntennaPod-8d8cae2decddeffeeb08a5444a66b115ebeaa7da.zip |
Merge pull request #4985 from ByteHamster/no-java-filtering
Replace Java-based feed filtering with SQL-based
Diffstat (limited to 'app/src/main/java')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java index 6be532887..acb929dd2 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java @@ -563,13 +563,12 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem @Nullable private Feed loadData() { - Feed feed = DBReader.getFeed(feedID); - if (feed != null && feed.getItemFilter() != null) { - DBReader.loadAdditionalFeedItemListData(feed.getItems()); - FeedItemFilter filter = feed.getItemFilter(); - feed.setItems(filter.filter(feed.getItems())); + Feed feed = DBReader.getFeed(feedID, true); + if (feed == null) { + return null; } - if (feed != null && feed.getSortOrder() != null) { + DBReader.loadAdditionalFeedItemListData(feed.getItems()); + if (feed.getSortOrder() != null) { List<FeedItem> feedItems = feed.getItems(); FeedItemPermutors.getPermutor(feed.getSortOrder()).reorder(feedItems); feed.setItems(feedItems); |