Don't use LongLists, use tags directly

5 files changed, 14 insertions, 92 deletions

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 51fb8f86f..fabe14174 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -378,33 +378,6 @@ public class AllEpisodesFragment extends Fragment {
             return item != null && item.isTagged(FeedItem.TAG_QUEUE);
         }
 
-        @Override
-        public LongList getQueueIds() {
-            LongList queueIds = new LongList();
-            if(episodes == null) {
-                return queueIds;
-            }
-            for(FeedItem item : episodes) {
-                if(item.isTagged(FeedItem.TAG_QUEUE)) {
-                    queueIds.add(item.getId());
-                }
-            }
-            return queueIds;
-        }
-
-        @Override
-        public LongList getFavoritesIds() {
-            LongList favoritesIds = new LongList();
-            if(episodes == null) {
-                return favoritesIds;
-            }
-            for(FeedItem item : episodes) {
-                if(item.isTagged(FeedItem.TAG_FAVORITE)) {
-                    favoritesIds.add(item.getId());
-                }
-            }
-            return favoritesIds;
-        }
     };
 
     public void onEventMainThread(FeedItemEvent event) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index eca6db34e..7fa799a3d 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -59,7 +59,6 @@ import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.DateUtils;
 import de.danoeh.antennapod.core.util.IntentUtils;
-import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.ShareUtils;
 import de.danoeh.antennapod.core.util.playback.Timeline;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
@@ -116,8 +115,6 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
     private long[] feedItems;
     private int feedItemPos;
     private FeedItem item;
-    private LongList queue;
-    private LongList favorites;
     private String webviewData;
     private List<Downloader> downloaderList;
 
@@ -313,10 +310,10 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
         inflater.inflate(R.menu.feeditem_options, menu);
         popupMenu = menu;
         if (item.hasMedia()) {
-            FeedItemMenuHandler.onPrepareMenu(popupMenuInterface, item, true, queue, favorites);
+            FeedItemMenuHandler.onPrepareMenu(popupMenuInterface, item, true, null);
         } else {
             // these are already available via button1 and button2
-            FeedItemMenuHandler.onPrepareMenu(popupMenuInterface, item, true, queue, favorites,
+            FeedItemMenuHandler.onPrepareMenu(popupMenuInterface, item, true, null,
                     R.id.mark_read_item, R.id.visit_website_item);
         }
     }
@@ -582,10 +579,8 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
             .subscribeOn(Schedulers.newThread())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(result -> {
-                item = (FeedItem) result[0];
-                queue = (LongList) result[1];
-                favorites = (LongList) result[2];
                 progbarLoading.setVisibility(View.GONE);
+                item = result;
                 if (!itemsLoaded) {
                     itemsLoaded = true;
                     onFragmentLoaded();
@@ -597,25 +592,13 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
             });
     }
 
-    private Object[] loadInBackground() {
+    private FeedItem loadInBackground() {
         FeedItem feedItem = DBReader.getFeedItem(feedItems[feedItemPos]);
         if (feedItem != null) {
             Timeline t = new Timeline(getActivity(), feedItem);
             webviewData = t.processShownotes(false);
         }
-        LongList queue;
-        if(feedItem.isTagged(FeedItem.TAG_QUEUE)) {
-            queue = LongList.of(feedItem.getId());
-        } else {
-            queue = new LongList(0);
-        }
-        LongList favorites;
-        if(feedItem.isTagged(FeedItem.TAG_FAVORITE)) {
-            favorites = LongList.of(feedItem.getId());
-        } else {
-            favorites = new LongList(0);
-        }
-        return new Object[] { feedItem, queue, favorites };
+        return feedItem;
     }
 
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index d304f3872..a6ab77e6f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -66,7 +66,6 @@ import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
-import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.gui.MoreContentListFooterUtil;
 import de.danoeh.antennapod.dialog.EpisodesApplyActionFragment;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
@@ -98,8 +97,6 @@ public class ItemlistFragment extends ListFragment {
 
     private long feedID;
     private Feed feed;
-    private LongList queuedItemsIds;
-    private LongList favoritedItemsId;
 
     private boolean itemsLoaded = false;
     private boolean viewsCreated = false;
@@ -321,8 +318,7 @@ public class ItemlistFragment extends ListFragment {
 
         contextMenu = menu;
         lastMenuInfo = (AdapterView.AdapterContextMenuInfo) menuInfo;
-        FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true, queuedItemsIds,
-                favoritedItemsId);
+        FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true, null);
     }
 
     @Override
@@ -599,11 +595,6 @@ public class ItemlistFragment extends ListFragment {
         }
 
         @Override
-        public boolean isInQueue(FeedItem item) {
-            return (queuedItemsIds != null) && queuedItemsIds.contains(item.getId());
-        }
-
-        @Override
         public int getItemDownloadProgressPercent(FeedItem item) {
             if (downloaderList != null) {
                 for (Downloader downloader : downloaderList) {
@@ -627,9 +618,7 @@ public class ItemlistFragment extends ListFragment {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     if (result != null) {
-                        feed = (Feed) result[0];
-                        queuedItemsIds = (LongList) result[1];
-                        favoritedItemsId = (LongList) result[2];
+                        feed = result;
                         itemsLoaded = true;
                         if (viewsCreated) {
                             onFragmentLoaded();
@@ -640,15 +629,14 @@ public class ItemlistFragment extends ListFragment {
                 });
     }
 
-    private Object[] loadData() {
+    private Feed loadData() {
         Feed feed = DBReader.getFeed(feedID);
+        DBReader.loadAdditionalFeedItemListData(feed.getItems());
         if(feed != null && feed.getItemFilter() != null) {
             FeedItemFilter filter = feed.getItemFilter();
             feed.setItems(filter.filter(feed.getItems()));
         }
-        LongList queuedItemsIds = DBReader.getQueueIDList();
-        LongList favoritedItemsId = DBReader.getFavoriteIDList();
-        return new Object[] { feed, queuedItemsIds, favoritedItemsId };
+        return feed;
     }
 
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
index 1d882aee1..491646c74 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
-import android.support.v4.util.Pair;
 import android.support.v4.view.MenuItemCompat;
 import android.util.Log;
 import android.view.Menu;
@@ -29,7 +28,7 @@ import de.danoeh.antennapod.core.service.download.Downloader;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
-import de.danoeh.antennapod.core.util.LongList;
+
 import de.greenrobot.event.EventBus;
 import rx.Observable;
 import rx.Subscription;
@@ -44,7 +43,6 @@ public class PlaybackHistoryFragment extends ListFragment {
             EventDistributor.PLAYER_STATUS_UPDATE;
 
     private List<FeedItem> playbackHistory;
-    private LongList queue;
     private FeedItemlistAdapter adapter;
 
     private boolean itemsLoaded = false;
@@ -218,10 +216,6 @@ public class PlaybackHistoryFragment extends ListFragment {
     }
 
     private FeedItemlistAdapter.ItemAccess itemAccess = new FeedItemlistAdapter.ItemAccess() {
-        @Override
-        public boolean isInQueue(FeedItem item) {
-            return (queue != null) && queue.contains(item.getId());
-        }
 
         @Override
         public int getItemDownloadProgressPercent(FeedItem item) {
@@ -260,8 +254,7 @@ public class PlaybackHistoryFragment extends ListFragment {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     if (result != null) {
-                        playbackHistory = result.first;
-                        queue = result.second;
+                        playbackHistory = result;
                         itemsLoaded = true;
                         if (viewsCreated) {
                             onFragmentLoaded();
@@ -272,11 +265,10 @@ public class PlaybackHistoryFragment extends ListFragment {
                 });
     }
 
-    private Pair<List<FeedItem>, LongList> loadData() {
+    private List<FeedItem> loadData() {
         List<FeedItem> history = DBReader.getPlaybackHistory();
-        LongList queue = DBReader.getQueueIDList();
         DBReader.loadAdditionalFeedItemListData(history);
-        return Pair.create(history, queue);
+        return history;
     }
 
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index fcec00ca6..08e681c99 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -568,20 +568,6 @@ public class QueueFragment extends Fragment {
         public LongList getQueueIds() {
             return queue != null ? LongList.of(FeedItemUtil.getIds(queue)) : new LongList(0);
         }
-
-        @Override
-        public LongList getFavoritesIds() {
-            LongList favoritesIds = new LongList();
-            if(queue == null) {
-                return favoritesIds;
-            }
-            for(FeedItem item : queue) {
-                if(item.isTagged(FeedItem.TAG_FAVORITE)) {
-                    favoritesIds.add(item.getId());
-                }
-            }
-            return favoritesIds;
-        }
     };
 
     private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {