From 24d1a06662c8eec31f3a4c3ebdcd3aea759fb63a Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Wed, 1 Mar 2023 20:52:23 +0100 Subject: Instead of specialized methods, use the global 'getEpisodes' method with a filter (#6358) --- .../java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java | 6 ++---- .../de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java | 3 ++- app/src/main/java/de/danoeh/antennapod/fragment/InboxFragment.java | 7 ++++--- .../de/danoeh/antennapod/ui/home/sections/DownloadsSection.java | 3 ++- .../java/de/danoeh/antennapod/ui/home/sections/InboxSection.java | 6 +++--- 5 files changed, 13 insertions(+), 12 deletions(-) (limited to 'app/src/main') diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java index dfbaf9695..7061a69f3 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java @@ -61,15 +61,13 @@ public class AllEpisodesFragment extends EpisodesListFragment { @NonNull @Override protected List loadData() { - return DBReader.getRecentlyPublishedEpisodes(0, page * EPISODES_PER_PAGE, - getFilter(), getSortOrder()); + return DBReader.getEpisodes(0, page * EPISODES_PER_PAGE, getFilter(), getSortOrder()); } @NonNull @Override protected List loadMoreData(int page) { - return DBReader.getRecentlyPublishedEpisodes((page - 1) * EPISODES_PER_PAGE, - EPISODES_PER_PAGE, getFilter(), getSortOrder()); + return DBReader.getEpisodes((page - 1) * EPISODES_PER_PAGE, EPISODES_PER_PAGE, getFilter(), getSortOrder()); } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java index f615252bd..dbc453301 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java @@ -315,7 +315,8 @@ public class CompletedDownloadsFragment extends Fragment emptyView.hide(); disposable = Observable.fromCallable(() -> { SortOrder sortOrder = UserPreferences.getDownloadsSortedOrder(); - List downloadedItems = DBReader.getDownloadedItems(sortOrder); + List downloadedItems = DBReader.getEpisodes(0, Integer.MAX_VALUE, + new FeedItemFilter(FeedItemFilter.DOWNLOADED), sortOrder); List mediaIds = new ArrayList<>(); if (runningDownloads == null) { diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/InboxFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/InboxFragment.java index c04adee6d..f8bcbb532 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/InboxFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/InboxFragment.java @@ -97,14 +97,15 @@ public class InboxFragment extends EpisodesListFragment { @NonNull @Override protected List loadData() { - return DBReader.getNewItemsList(0, page * EPISODES_PER_PAGE, UserPreferences.getInboxSortedOrder()); + return DBReader.getEpisodes(0, page * EPISODES_PER_PAGE, + new FeedItemFilter(FeedItemFilter.NEW), UserPreferences.getInboxSortedOrder()); } @NonNull @Override protected List loadMoreData(int page) { - return DBReader.getNewItemsList((page - 1) * EPISODES_PER_PAGE, EPISODES_PER_PAGE, - UserPreferences.getInboxSortedOrder()); + return DBReader.getEpisodes((page - 1) * EPISODES_PER_PAGE, EPISODES_PER_PAGE, + new FeedItemFilter(FeedItemFilter.NEW), UserPreferences.getInboxSortedOrder()); } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/ui/home/sections/DownloadsSection.java b/app/src/main/java/de/danoeh/antennapod/ui/home/sections/DownloadsSection.java index 0053b0e82..1240546c4 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/home/sections/DownloadsSection.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/home/sections/DownloadsSection.java @@ -124,7 +124,8 @@ public class DownloadsSection extends HomeSection { disposable.dispose(); } SortOrder sortOrder = UserPreferences.getDownloadsSortedOrder(); - disposable = Observable.fromCallable(() -> DBReader.getDownloadedItems(sortOrder)) + disposable = Observable.fromCallable(() -> DBReader.getEpisodes(0, Integer.MAX_VALUE, + new FeedItemFilter(FeedItemFilter.DOWNLOADED), sortOrder)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(downloads -> { diff --git a/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java b/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java index 6baea05e6..8d343a16a 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java @@ -26,7 +26,6 @@ import de.danoeh.antennapod.fragment.InboxFragment; import de.danoeh.antennapod.fragment.swipeactions.SwipeActions; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedItemFilter; -import de.danoeh.antennapod.storage.database.PodDBAdapter; import de.danoeh.antennapod.storage.preferences.UserPreferences; import de.danoeh.antennapod.ui.home.HomeSection; import io.reactivex.Observable; @@ -126,8 +125,9 @@ public class InboxSection extends HomeSection { disposable.dispose(); } disposable = Observable.fromCallable(() -> - new Pair<>(DBReader.getNewItemsList(0, NUM_EPISODES, UserPreferences.getInboxSortedOrder()), - PodDBAdapter.getInstance().getNumberOfNewItems())) + new Pair<>(DBReader.getEpisodes(0, NUM_EPISODES, + new FeedItemFilter(FeedItemFilter.NEW), UserPreferences.getInboxSortedOrder()), + DBReader.getTotalEpisodeCount(new FeedItemFilter(FeedItemFilter.NEW)))) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(data -> { -- cgit v1.2.3