summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java16
1 files changed, 4 insertions, 12 deletions
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;
}
}