Merge pull request #706 from mfietz/feature/gpodder_episode_actions

Sync episode actions with gpodder, smart mark as played.

15 files changed, 285 insertions, 157 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 821c86044..f056b107b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -135,11 +135,9 @@ public class AudioplayerActivity extends MediaplayerActivity implements ItemDesc
     @Override
     protected void onStop() {
         super.onStop();
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "onStop");
+        Log.d(TAG, "onStop()");
         cancelLoadTask();
         EventDistributor.getInstance().unregister(contentUpdate);
-
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 2efee838d..a28e4114b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -25,11 +25,11 @@ import org.apache.commons.lang3.Validate;
 
 import java.util.List;
 
-import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.NavListAdapter;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.QueueEvent;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.StorageUtils;
@@ -42,6 +42,7 @@ import de.danoeh.antennapod.fragment.PlaybackHistoryFragment;
 import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
 import de.danoeh.antennapod.preferences.PreferenceController;
+import de.greenrobot.event.EventBus;
 
 /**
  * The activity that is shown when the user launches the app.
@@ -51,8 +52,7 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
     private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED
             | EventDistributor.DOWNLOAD_QUEUED
             | EventDistributor.FEED_LIST_UPDATE
-            | EventDistributor.UNREAD_ITEMS_UPDATE
-            | EventDistributor.QUEUE_UPDATE;
+            | EventDistributor.UNREAD_ITEMS_UPDATE;
 
     public static final String PREF_NAME = "MainActivityPrefs";
     public static final String PREF_IS_FIRST_LAUNCH = "prefMainActivityIsFirstLaunch";
@@ -324,6 +324,13 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+        EventDistributor.getInstance().register(contentUpdate);
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
     protected void onPause() {
         super.onPause();
     }
@@ -332,7 +339,6 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
     protected void onResume() {
         super.onResume();
         StorageUtils.checkStorageAvailability(this);
-        EventDistributor.getInstance().register(contentUpdate);
 
         Intent intent = getIntent();
         if (navDrawerData != null && intent.hasExtra(EXTRA_NAV_INDEX) && intent.hasExtra(EXTRA_NAV_TYPE)) {
@@ -347,6 +353,7 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
         super.onStop();
         cancelLoadTask();
         EventDistributor.getInstance().unregister(contentUpdate);
+        EventBus.getDefault().unregister(this);
     }
 
     @Override
@@ -435,13 +442,17 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
         }
     }
 
+    public void onEvent(QueueEvent event) {
+        Log.d(TAG, "onEvent(" + event + ")");
+        loadData();
+    }
+
     private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
 
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
             if ((EVENTS & arg) != 0) {
-                if (BuildConfig.DEBUG)
-                    Log.d(TAG, "Received contentUpdate Intent.");
+                Log.d(TAG, "Received contentUpdate Intent.");
                 loadData();
             }
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 099e96be9..8edd4185c 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -12,13 +12,11 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.Window;
 import android.widget.ImageButton;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 
-import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
@@ -167,8 +165,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
         chooseTheme();
         super.onCreate(savedInstanceState);
 
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Creating Activity");
+        Log.d(TAG, "onCreate()");
         StorageUtils.checkStorageAvailability(this);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
@@ -224,8 +221,8 @@ public abstract class MediaplayerActivity extends ActionBarActivity
     @Override
     protected void onStop() {
         super.onStop();
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Activity stopped");
+        Log.d(TAG, "onStop()");
+
         if (controller != null) {
             controller.release();
         }
@@ -234,8 +231,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Activity destroyed");
+        Log.d(TAG, "onDestroy()");
     }
 
     @Override
@@ -358,8 +354,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
     @Override
     protected void onResume() {
         super.onResume();
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Resuming Activity");
+        Log.d(TAG, "onResume()");
         StorageUtils.checkStorageAvailability(this);
         controller.init();
     }
@@ -393,8 +388,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
     }
 
     private void updateProgressbarPosition(int position, int duration) {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Updating progressbar info");
+        Log.d(TAG, "updateProgressbarPosition(" + position + ", " + duration +")");
         float progress = ((float) position) / duration;
         sbPosition.setProgress((int) (progress * sbPosition.getMax()));
     }
@@ -406,8 +400,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
      * FeedMedia object.
      */
     protected boolean loadMediaInfo() {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Loading media info");
+        Log.d(TAG, "loadMediaInfo()");
         Playable media = controller.getMedia();
         if (media != null) {
             txtvPosition.setText(Converter.getDurationStringLong((media
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
index 14644dd68..d3843934a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -11,6 +11,8 @@ import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetEpisodeAction;
+import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
@@ -61,6 +63,19 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
         } else {
             if (!item.isRead()) {
                 DBWriter.markItemRead(context, item, true, true);
+
+                if(GpodnetPreferences.loggedIn()) {
+                    // gpodder: send played action
+                    FeedMedia media = item.getMedia();
+                    GpodnetEpisodeAction action = new GpodnetEpisodeAction.Builder(item, GpodnetEpisodeAction.Action.PLAY)
+                            .currentDeviceId()
+                            .currentTimestamp()
+                            .started(media.getDuration() / 1000)
+                            .position(media.getDuration() / 1000)
+                            .total(media.getDuration() / 1000)
+                            .build();
+                    GpodnetPreferences.enqueueEpisodeAction(action);
+                }
             }
         }
     }
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 d63d66966..3ca5b3c89 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -8,6 +8,7 @@ import android.support.v4.app.ListFragment;
 import android.view.View;
 import android.widget.ListView;
 
+import java.util.Collections;
 import java.util.List;
 
 import de.danoeh.antennapod.R;
@@ -17,7 +18,6 @@ import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.core.util.QueueAccess;
 
 /**
  * Displays all running downloads and provides a button to delete them
@@ -26,11 +26,9 @@ public class CompletedDownloadsFragment extends ListFragment {
     private static final int EVENTS =
             EventDistributor.DOWNLOAD_HANDLED |
                     EventDistributor.DOWNLOADLOG_UPDATE |
-                    EventDistributor.QUEUE_UPDATE |
                     EventDistributor.UNREAD_ITEMS_UPDATE;
 
     private List<FeedItem> items;
-    private QueueAccess queue;
     private DownloadedEpisodesListAdapter listAdapter;
 
     private boolean viewCreated = false;
@@ -155,7 +153,7 @@ public class CompletedDownloadsFragment extends ListFragment {
         }
     }
 
-    private class ItemLoader extends AsyncTask<Void, Void, Object[]> {
+    private class ItemLoader extends AsyncTask<Void, Void, List<FeedItem>> {
 
         @Override
         protected void onPreExecute() {
@@ -166,11 +164,10 @@ public class CompletedDownloadsFragment extends ListFragment {
         }
 
         @Override
-        protected void onPostExecute(Object[] results) {
+        protected void onPostExecute(List<FeedItem> results) {
             super.onPostExecute(results);
             if (results != null) {
-                items = (List<FeedItem>) results[0];
-                queue = (QueueAccess) results[1];
+                items = results;
                 itemsLoaded = true;
                 if (viewCreated && getActivity() != null) {
                     onFragmentLoaded();
@@ -179,13 +176,12 @@ public class CompletedDownloadsFragment extends ListFragment {
         }
 
         @Override
-        protected Object[] doInBackground(Void... params) {
+        protected List<FeedItem> doInBackground(Void... params) {
             Context context = getActivity();
             if (context != null) {
-                return new Object[]{DBReader.getDownloadedItems(context),
-                        QueueAccess.IDListAccess(DBReader.getQueueIDList(context))};
+                return DBReader.getDownloadedItems(context);
             }
-            return null;
+            return Collections.emptyList();
         }
     }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index a42658057..fdb128f03 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -13,7 +13,6 @@ import android.widget.TextView;
 
 import com.squareup.picasso.Picasso;
 
-import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.util.Converter;
@@ -54,8 +53,7 @@ public class ExternalPlayerFragment extends Fragment {
 
             @Override
             public void onClick(View v) {
-                if (BuildConfig.DEBUG)
-                    Log.d(TAG, "layoutInfo was clicked");
+                Log.d(TAG, "layoutInfo was clicked");
 
                 if (controller.getMedia() != null) {
                     startActivity(PlaybackService.getPlayerActivityIntent(
@@ -90,14 +88,10 @@ public class ExternalPlayerFragment extends Fragment {
 
             @Override
             public void onBufferStart() {
-                // TODO Auto-generated method stub
-
             }
 
             @Override
             public void onBufferEnd() {
-                // TODO Auto-generated method stub
-
             }
 
             @Override
@@ -153,7 +147,6 @@ public class ExternalPlayerFragment extends Fragment {
                     butPlay.setOnClickListener(controller
                             .newOnPlayButtonClickListener());
                 }
-
             }
 
             @Override
@@ -170,8 +163,6 @@ public class ExternalPlayerFragment extends Fragment {
 
             @Override
             public void onPlaybackSpeedChange() {
-                // TODO Auto-generated method stub
-
             }
         };
     }
@@ -185,8 +176,7 @@ public class ExternalPlayerFragment extends Fragment {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Fragment is about to be destroyed");
+        Log.d(TAG, "Fragment is about to be destroyed");
         if (controller != null) {
             controller.release();
         }
@@ -201,8 +191,7 @@ public class ExternalPlayerFragment extends Fragment {
     }
 
     private boolean loadMediaInfo() {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Loading media info");
+        Log.d(TAG, "Loading media info");
         if (controller.serviceAvailable()) {
             Playable media = controller.getMedia();
             if (media != null) {
@@ -221,13 +210,11 @@ public class ExternalPlayerFragment extends Fragment {
                 }
                 return true;
             } else {
-                Log.w(TAG,
-                        "loadMediaInfo was called while the media object of playbackService was null!");
+                Log.w(TAG,  "loadMediaInfo was called while the media object of playbackService was null!");
                 return false;
             }
         } else {
-            Log.w(TAG,
-                    "loadMediaInfo was called while playbackService was null!");
+            Log.w(TAG, "loadMediaInfo was called while playbackService was null!");
             return false;
         }
     }
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 e80bf5f14..10409a421 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -17,6 +17,7 @@ import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -43,6 +44,7 @@ import de.danoeh.antennapod.core.asynctask.DownloadObserver;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.QueueEvent;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.Downloader;
 import de.danoeh.antennapod.core.storage.DBReader;
@@ -51,18 +53,20 @@ import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.Converter;
-import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.playback.Timeline;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
+import de.greenrobot.event.EventBus;
 
 /**
  * Displays information about a FeedItem and actions.
  */
-public class ItemFragment extends Fragment implements LoaderManager.LoaderCallbacks<Pair<FeedItem, QueueAccess>> {
+public class ItemFragment extends Fragment implements LoaderManager.LoaderCallbacks<Pair<FeedItem, LongList>> {
+
+    private static final String TAG = "ItemFragment";
 
     private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED |
             EventDistributor.DOWNLOAD_QUEUED |
-            EventDistributor.QUEUE_UPDATE |
             EventDistributor.UNREAD_ITEMS_UPDATE;
 
     private static final String ARG_FEEDITEM = "feeditem";
@@ -84,7 +88,7 @@ public class ItemFragment extends Fragment implements LoaderManager.LoaderCallba
     private boolean itemsLoaded = false;
     private long itemID;
     private FeedItem item;
-    private QueueAccess queue;
+    private LongList queue;
     private String webviewData;
     private DownloadObserver downloadObserver;
     private List<Downloader> downloaderList;
@@ -124,6 +128,7 @@ public class ItemFragment extends Fragment implements LoaderManager.LoaderCallba
     public void onStart() {
         super.onStart();
         EventDistributor.getInstance().register(contentUpdate);
+        EventBus.getDefault().register(this);
         if (downloadObserver != null) {
             downloadObserver.setActivity(getActivity());
             downloadObserver.onResume();
@@ -138,6 +143,7 @@ public class ItemFragment extends Fragment implements LoaderManager.LoaderCallba
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
+        EventBus.getDefault().unregister(this);
     }
 
     private void resetViewState() {
@@ -387,25 +393,29 @@ public class ItemFragment extends Fragment implements LoaderManager.LoaderCallba
         }
     }
 
+    public void onEvent(QueueEvent event) {
+        Log.d(TAG, "onEvent(" + event + ")");
+        getLoaderManager().restartLoader(0, null, ItemFragment.this);
+    }
 
     @Override
-    public Loader<Pair<FeedItem, QueueAccess>> onCreateLoader(int id, Bundle args) {
-        return new DBTaskLoader<Pair<FeedItem, QueueAccess>>(getActivity()) {
+    public Loader<Pair<FeedItem,LongList>> onCreateLoader(int id, Bundle args) {
+        return new DBTaskLoader<Pair<FeedItem,LongList>>(getActivity()) {
             @Override
-            public Pair<FeedItem, QueueAccess> loadInBackground() {
+            public Pair<FeedItem,LongList> loadInBackground() {
                 FeedItem data1 = DBReader.getFeedItem(getContext(), itemID);
                 if (data1 != null) {
                     Timeline t = new Timeline(getActivity(), data1);
                     webviewData = t.processShownotes(false);
                 }
-                QueueAccess data2 = QueueAccess.IDListAccess(DBReader.getQueueIDList(getContext()));
+                LongList data2 = DBReader.getQueueIDList(getContext());
                 return Pair.create(data1, data2);
             }
         };
     }
 
     @Override
-    public void onLoadFinished(Loader<Pair<FeedItem, QueueAccess>> loader, Pair<FeedItem, QueueAccess> data) {
+    public void onLoadFinished(Loader<Pair<FeedItem,LongList>> loader, Pair<FeedItem,LongList> data) {
 
         if (data != null) {
             item = data.first;
@@ -420,8 +430,7 @@ public class ItemFragment extends Fragment implements LoaderManager.LoaderCallba
     }
 
     @Override
-    public void onLoaderReset(Loader<Pair<FeedItem, QueueAccess>> loader) {
-
+    public void onLoaderReset(Loader<Pair<FeedItem,LongList>> loader) {
     }
 
     private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
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 acb07626c..a2cb8da18 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -9,6 +9,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.ListFragment;
+import android.support.v4.util.Pair;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.SearchView;
 import android.util.Log;
@@ -29,7 +30,6 @@ import org.apache.commons.lang3.Validate;
 
 import java.util.List;
 
-import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.FeedInfoActivity;
 import de.danoeh.antennapod.activity.MainActivity;
@@ -44,17 +44,19 @@ import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.QueueEvent;
 import de.danoeh.antennapod.core.service.download.DownloadService;
 import de.danoeh.antennapod.core.service.download.Downloader;
 import de.danoeh.antennapod.core.storage.DBReader;
 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.QueueAccess;
+import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.gui.MoreContentListFooterUtil;
 import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
 import de.danoeh.antennapod.menuhandler.MenuItemUtils;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
+import de.greenrobot.event.EventBus;
 
 /**
  * Displays a list of FeedItems.
@@ -65,7 +67,6 @@ public class ItemlistFragment extends ListFragment {
 
     private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED
             | EventDistributor.DOWNLOAD_QUEUED
-            | EventDistributor.QUEUE_UPDATE
             | EventDistributor.UNREAD_ITEMS_UPDATE
             | EventDistributor.PLAYER_STATUS_UPDATE;
 
@@ -76,7 +77,7 @@ public class ItemlistFragment extends ListFragment {
 
     private long feedID;
     private Feed feed;
-    protected QueueAccess queue;
+    private LongList queue;
 
     private boolean itemsLoaded = false;
     private boolean viewsCreated = false;
@@ -118,6 +119,7 @@ public class ItemlistFragment extends ListFragment {
     public void onStart() {
         super.onStart();
         EventDistributor.getInstance().register(contentUpdate);
+        EventBus.getDefault().register(this);
         if (downloadObserver != null) {
             downloadObserver.setActivity(getActivity());
             downloadObserver.onResume();
@@ -131,6 +133,7 @@ public class ItemlistFragment extends ListFragment {
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
+        EventBus.getDefault().unregister(this);
         stopItemLoader();
     }
 
@@ -283,13 +286,17 @@ public class ItemlistFragment extends ListFragment {
         }
     }
 
+    public void onEvent(QueueEvent event) {
+        Log.d(TAG, "onEvent(" + event + ")");
+        startItemLoader();
+    }
+
     private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
 
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
             if ((EVENTS & arg) != 0) {
-                if (BuildConfig.DEBUG)
-                    Log.d(TAG, "Received contentUpdate Intent.");
+                Log.d(TAG, "Received contentUpdate Intent.");
                 if ((EventDistributor.DOWNLOAD_QUEUED & arg) != 0) {
                     updateProgressBarVisibility();
                 } else {
@@ -474,25 +481,26 @@ public class ItemlistFragment extends ListFragment {
         }
     }
 
-    private class ItemLoader extends AsyncTask<Long, Void, Object[]> {
+    private class ItemLoader extends AsyncTask<Long, Void, Pair<Feed,LongList>> {
         @Override
-        protected Object[] doInBackground(Long... params) {
+        protected Pair<Feed,LongList> doInBackground(Long... params) {
             long feedID = params[0];
             Context context = getActivity();
             if (context != null) {
-                return new Object[]{DBReader.getFeed(context, feedID),
-                        QueueAccess.IDListAccess(DBReader.getQueueIDList(context))};
+                Feed feed = DBReader.getFeed(context, feedID);
+                LongList queue = DBReader.getQueueIDList(context);
+                return Pair.create(feed, queue);
             } else {
                 return null;
             }
         }
 
         @Override
-        protected void onPostExecute(Object[] res) {
+        protected void onPostExecute(Pair<Feed,LongList> res) {
             super.onPostExecute(res);
             if (res != null) {
-                feed = (Feed) res[0];
-                queue = (QueueAccess) res[1];
+                feed = res.first;
+                queue = res.second;
                 itemsLoaded = true;
                 if (viewsCreated) {
                     onFragmentLoaded();
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
index 8bc4099a9..eda01a851 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
@@ -7,7 +7,6 @@ import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.Parcelable;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.SearchView;
 import android.util.Log;
@@ -37,6 +36,7 @@ import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.QueueEvent;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.DownloadService;
 import de.danoeh.antennapod.core.service.download.Downloader;
@@ -44,11 +44,12 @@ import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
-import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.gui.FeedItemUndoToken;
 import de.danoeh.antennapod.core.util.gui.UndoBarController;
 import de.danoeh.antennapod.menuhandler.MenuItemUtils;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
+import de.greenrobot.event.EventBus;
 
 /**
  * Shows unread or recently published episodes
@@ -57,7 +58,6 @@ public class NewEpisodesFragment extends Fragment {
     private static final String TAG = "NewEpisodesFragment";
     private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED |
             EventDistributor.DOWNLOAD_QUEUED |
-            EventDistributor.QUEUE_UPDATE |
             EventDistributor.UNREAD_ITEMS_UPDATE |
             EventDistributor.PLAYER_STATUS_UPDATE;
 
@@ -76,7 +76,7 @@ public class NewEpisodesFragment extends Fragment {
 
     private List<FeedItem> unreadItems;
     private List<FeedItem> recentItems;
-    private QueueAccess queueAccess;
+    private LongList queue;
     private List<Downloader> downloaderList;
 
     private boolean itemsLoaded = false;
@@ -108,6 +108,7 @@ public class NewEpisodesFragment extends Fragment {
     public void onStart() {
         super.onStart();
         EventDistributor.getInstance().register(contentUpdate);
+        EventBus.getDefault().register(this);
         this.activity.set((MainActivity) getActivity());
         if (downloadObserver != null) {
             downloadObserver.setActivity(getActivity());
@@ -128,7 +129,11 @@ public class NewEpisodesFragment extends Fragment {
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
+        EventBus.getDefault().unregister(this);
         stopItemLoader();
+        if(undoBarController.isShowing()) {
+            undoBarController.close();
+        }
     }
 
     @Override
@@ -295,15 +300,26 @@ public class NewEpisodesFragment extends Fragment {
             }
         });
 
-        undoBarController = new UndoBarController(root.findViewById(R.id.undobar), new UndoBarController.UndoListener() {
+        undoBarController = new UndoBarController<FeedItemUndoToken>(root.findViewById(R.id.undobar), new UndoBarController.UndoListener<FeedItemUndoToken>() {
+
+            private final Context context = getActivity();
+
             @Override
-            public void onUndo(Parcelable token) {
-                // Perform the undo
-                FeedItemUndoToken undoToken = (FeedItemUndoToken) token;
+            public void onUndo(FeedItemUndoToken token) {
                 if (token != null) {
-                    long itemId = undoToken.getFeedItemId();
-                    int position = undoToken.getPosition();
-                    DBWriter.markItemRead(getActivity(), itemId, false);
+                    long itemId = token.getFeedItemId();
+                    DBWriter.markItemRead(context, itemId, false);
+                }
+            }
+            @Override
+            public void onHide(FeedItemUndoToken token) {
+                if (token != null && context != null) {
+                    long itemId = token.getFeedItemId();
+                    FeedItem item = DBReader.getFeedItem(context, itemId);
+                    FeedMedia media = item.getMedia();
+                    if(media != null && media.hasAlmostEnded() && UserPreferences.isAutoDelete()) {
+                        DBWriter.deleteFeedMediaOfItem(context, media.getId());
+                    }
                 }
             }
         });
@@ -389,7 +405,7 @@ public class NewEpisodesFragment extends Fragment {
         @Override
         public boolean isInQueue(FeedItem item) {
             if (itemsLoaded) {
-                return queueAccess.contains(item.getId());
+                return queue.contains(item.getId());
             } else {
                 return false;
             }
@@ -398,6 +414,11 @@ public class NewEpisodesFragment extends Fragment {
 
     };
 
+    public void onEvent(QueueEvent event) {
+        Log.d(TAG, "onEvent(" + event + ")");
+        startItemLoader();
+    }
+
     private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
@@ -469,9 +490,11 @@ public class NewEpisodesFragment extends Fragment {
         protected Object[] doInBackground(Void... params) {
             Context context = activity.get();
             if (context != null) {
-                return new Object[]{DBReader.getUnreadItemsList(context),
+                return new Object[] {
+                        DBReader.getUnreadItemsList(context),
                         DBReader.getRecentlyPublishedEpisodes(context, RECENT_EPISODES_LIMIT),
-                        QueueAccess.IDListAccess(DBReader.getQueueIDList(context))};
+                        DBReader.getQueueIDList(context)
+                };
             } else {
                 return null;
             }
@@ -486,7 +509,7 @@ public class NewEpisodesFragment extends Fragment {
             if (lists != null) {
                 unreadItems = (List<FeedItem>) lists[0];
                 recentItems = (List<FeedItem>) lists[1];
-                queueAccess = (QueueAccess) lists[2];
+                queue = (LongList) lists[2];
                 itemsLoaded = true;
                 if (viewsCreated && activity.get() != null) {
                     onFragmentLoaded();
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 ab38af106..647fe550d 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
@@ -7,7 +7,9 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 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;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -25,12 +27,14 @@ import de.danoeh.antennapod.core.asynctask.DownloadObserver;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.QueueEvent;
 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.QueueAccess;
+import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.menuhandler.MenuItemUtils;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
+import de.greenrobot.event.EventBus;
 
 public class PlaybackHistoryFragment extends ListFragment {
     private static final String TAG = "PlaybackHistoryFragment";
@@ -38,7 +42,7 @@ public class PlaybackHistoryFragment extends ListFragment {
             EventDistributor.PLAYER_STATUS_UPDATE;
 
     private List<FeedItem> playbackHistory;
-    private QueueAccess queue;
+    private LongList queue;
     private FeedItemlistAdapter adapter;
 
     private boolean itemsLoaded = false;
@@ -66,12 +70,14 @@ public class PlaybackHistoryFragment extends ListFragment {
     public void onStart() {
         super.onStart();
         EventDistributor.getInstance().register(contentUpdate);
+        EventBus.getDefault().register(this);
     }
 
     @Override
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
+        EventBus.getDefault().unregister(this);
         stopItemLoader();
     }
 
@@ -165,6 +171,11 @@ public class PlaybackHistoryFragment extends ListFragment {
         }
     }
 
+    public void onEvent(QueueEvent event) {
+        Log.d(TAG, "onEvent(" + event + ")");
+        startItemLoader();
+    }
+
     private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
 
         @Override
@@ -251,27 +262,27 @@ public class PlaybackHistoryFragment extends ListFragment {
         }
     }
 
-    private class ItemLoader extends AsyncTask<Void, Void, Object[]> {
+    private class ItemLoader extends AsyncTask<Void, Void, Pair<List<FeedItem>,LongList>> {
 
         @Override
-        protected Object[] doInBackground(Void... params) {
+        protected Pair<List<FeedItem>,LongList> doInBackground(Void... params) {
             Context context = activity.get();
             if (context != null) {
-                List<FeedItem> ph = DBReader.getPlaybackHistory(context);
-                DBReader.loadFeedDataOfFeedItemlist(context, ph);
-                return new Object[]{ph,
-                        QueueAccess.IDListAccess(DBReader.getQueueIDList(context))};
+                List<FeedItem> history = DBReader.getPlaybackHistory(context);
+                LongList queue = DBReader.getQueueIDList(context);
+                DBReader.loadFeedDataOfFeedItemlist(context, history);
+                return Pair.create(history, queue);
             } else {
                 return null;
             }
         }
 
         @Override
-        protected void onPostExecute(Object[] res) {
+        protected void onPostExecute(Pair<List<FeedItem>,LongList> res) {
             super.onPostExecute(res);
             if (res != null) {
-                playbackHistory = (List<FeedItem>) res[0];
-                queue = (QueueAccess) res[1];
+                playbackHistory = res.first;
+                queue = res.second;
                 itemsLoaded = true;
                 if (viewsCreated) {
                     onFragmentLoaded();
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 70a231cad..a3721d7b3 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -7,7 +7,6 @@ import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.Parcelable;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.SearchView;
 import android.util.Log;
@@ -37,6 +36,8 @@ import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.QueueEvent;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.DownloadService;
 import de.danoeh.antennapod.core.service.download.Downloader;
 import de.danoeh.antennapod.core.storage.DBReader;
@@ -48,6 +49,7 @@ import de.danoeh.antennapod.core.util.gui.FeedItemUndoToken;
 import de.danoeh.antennapod.core.util.gui.UndoBarController;
 import de.danoeh.antennapod.menuhandler.MenuItemUtils;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
+import de.greenrobot.event.EventBus;
 
 /**
  * Shows all items in the queue
@@ -56,7 +58,6 @@ public class QueueFragment extends Fragment {
     private static final String TAG = "QueueFragment";
     private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED |
             EventDistributor.DOWNLOAD_QUEUED |
-            EventDistributor.QUEUE_UPDATE |
             EventDistributor.PLAYER_STATUS_UPDATE;
 
     private DragSortListView listView;
@@ -64,7 +65,7 @@ public class QueueFragment extends Fragment {
     private TextView txtvEmpty;
     private ProgressBar progLoading;
 
-    private UndoBarController undoBarController;
+    private UndoBarController<FeedItemUndoToken> undoBarController;
 
     private List<FeedItem> queue;
     private List<Downloader> downloaderList;
@@ -104,6 +105,7 @@ public class QueueFragment extends Fragment {
     public void onStart() {
         super.onStart();
         EventDistributor.getInstance().register(contentUpdate);
+        EventBus.getDefault().register(this);
         this.activity.set((MainActivity) getActivity());
         if (downloadObserver != null) {
             downloadObserver.setActivity(getActivity());
@@ -124,7 +126,11 @@ public class QueueFragment extends Fragment {
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
+        EventBus.getDefault().unregister(this);
         stopItemLoader();
+        if(undoBarController.isShowing()) {
+            undoBarController.close();
+        }
     }
 
     @Override
@@ -133,6 +139,15 @@ public class QueueFragment extends Fragment {
         this.activity.set((MainActivity) activity);
     }
 
+    public void onEventMainThread(QueueEvent event) {
+        Log.d(TAG, "onEvent(" + event + ")");
+        if(event.action == QueueEvent.Action.REMOVED) {
+            undoBarController.showUndoBar(false, getString(R.string.removed_from_queue),
+                    new FeedItemUndoToken(event.item, event.position));
+        }
+        startItemLoader();
+    }
+
     private void saveScrollPosition() {
         SharedPreferences prefs = getActivity().getSharedPreferences(PREFS, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = prefs.edit();
@@ -295,7 +310,7 @@ public class QueueFragment extends Fragment {
                 DBWriter.moveQueueItemToBottom(getActivity(), selectedItem.getId(), true);
                 return true;
             case R.id.remove_from_queue_item:
-                DBWriter.removeQueueItem(getActivity(), selectedItem.getId(), false);
+                DBWriter.removeQueueItem(getActivity(), selectedItem, false);
                 return true;
             default:
                 return super.onContextItemSelected(item);
@@ -343,29 +358,42 @@ public class QueueFragment extends Fragment {
 
             @Override
             public void remove(int which) {
-                Log.d(TAG, "remove("+which+")");
+                Log.d(TAG, "remove(" + which + ")");
                 stopItemLoader();
                 FeedItem item = (FeedItem) listView.getAdapter().getItem(which);
-                DBWriter.removeQueueItem(getActivity(), item.getId(), true);
-                undoBarController.showUndoBar(false,
-                        getString(R.string.removed_from_queue), new FeedItemUndoToken(item,
-                                which)
-                );
+                DBWriter.markItemRead(getActivity(), item.getId(), true);
+                DBWriter.removeQueueItem(getActivity(), item, true);
             }
         });
 
-        undoBarController = new UndoBarController(root.findViewById(R.id.undobar), new UndoBarController.UndoListener() {
-                        @Override
-                        public void onUndo(Parcelable token) {
-                                // Perform the undo
-                        FeedItemUndoToken undoToken = (FeedItemUndoToken) token;
-                                if (token != null) {
-                                        long itemId = undoToken.getFeedItemId();
-                                        int position = undoToken.getPosition();
-                                        DBWriter.addQueueItemAt(getActivity(), itemId, position, false);
-                                    }
-                            }
-                    });
+        undoBarController = new UndoBarController<FeedItemUndoToken>(root.findViewById(R.id.undobar),
+                new UndoBarController.UndoListener<FeedItemUndoToken>() {
+
+            private final Context context = getActivity();
+
+            @Override
+            public void onUndo(FeedItemUndoToken token) {
+                if (token != null) {
+                    long itemId = token.getFeedItemId();
+                    int position = token.getPosition();
+                    DBWriter.markItemRead(context, itemId, false);
+                    DBWriter.addQueueItemAt(context, itemId, position, false);
+                }
+            }
+
+            @Override
+            public void onHide(FeedItemUndoToken token) {
+                if (token != null && context != null) {
+                    long itemId = token.getFeedItemId();
+                    FeedItem item = DBReader.getFeedItem(context, itemId);
+                    FeedMedia media = item.getMedia();
+                    if(media != null && media.hasAlmostEnded() && UserPreferences.isAutoDelete()) {
+                        DBWriter.deleteFeedMediaOfItem(context, media.getId());
+                    }
+                }
+            }
+
+        });
 
 
         registerForContextMenu(listView);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
index cf96bb094..3d6722370 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
@@ -13,6 +13,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
 
+import java.util.Collections;
 import java.util.List;
 
 import de.danoeh.antennapod.R;
@@ -23,9 +24,7 @@ import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedComponent;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.SearchResult;
-import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.FeedSearcher;
-import de.danoeh.antennapod.core.util.QueueAccess;
 import de.danoeh.antennapod.menuhandler.MenuItemUtils;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
 
@@ -44,8 +43,6 @@ public class SearchFragment extends ListFragment {
     private boolean viewCreated = false;
     private boolean itemsLoaded = false;
 
-    private QueueAccess queue;
-
     /**
      * Create a new SearchFragment that searches all feeds.
      */
@@ -165,8 +162,7 @@ public class SearchFragment extends ListFragment {
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
             if ((arg & (EventDistributor.UNREAD_ITEMS_UPDATE
-                    | EventDistributor.DOWNLOAD_HANDLED
-                    | EventDistributor.QUEUE_UPDATE)) != 0) {
+                    | EventDistributor.DOWNLOAD_HANDLED)) != 0) {
                 startSearchTask();
             }
         }
@@ -209,17 +205,16 @@ public class SearchFragment extends ListFragment {
         }
     }
 
-    private class SearchTask extends AsyncTask<Bundle, Void, Object[]> {
+    private class SearchTask extends AsyncTask<Bundle, Void, List<SearchResult>> {
         @Override
-        protected Object[] doInBackground(Bundle... params) {
+        protected List<SearchResult> doInBackground(Bundle... params) {
             String query = params[0].getString(ARG_QUERY);
             long feed = params[0].getLong(ARG_FEED);
             Context context = getActivity();
             if (context != null) {
-                return new Object[]{FeedSearcher.performSearch(context, query, feed),
-                        QueueAccess.IDListAccess(DBReader.getQueueIDList(context))};
+                return FeedSearcher.performSearch(context, query, feed);
             } else {
-                return null;
+                return Collections.emptyList();
             }
         }
 
@@ -232,12 +227,11 @@ public class SearchFragment extends ListFragment {
         }
 
         @Override
-        protected void onPostExecute(Object[] results) {
+        protected void onPostExecute(List<SearchResult> results) {
             super.onPostExecute(results);
             if (results != null) {
                 itemsLoaded = true;
-                searchResults = (List<SearchResult>) results[0];
-                queue = (QueueAccess) results[1];
+                searchResults = results;
                 if (viewCreated) {
                     onFragmentLoaded();
                 }
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index 8ccbdafc6..ebb0a9e58 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -4,15 +4,19 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
-import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetEpisodeAction;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetEpisodeAction.Action;
+import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
-import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.ShareUtils;
 
 /**
@@ -52,7 +56,7 @@ public class FeedItemMenuHandler {
      * @return Returns true if selectedItem is not null.
      */
     public static boolean onPrepareMenu(MenuInterface mi,
-                                        FeedItem selectedItem, boolean showExtendedMenu, QueueAccess queueAccess) {
+                                        FeedItem selectedItem, boolean showExtendedMenu, LongList queueAccess) {
         if (selectedItem == null) {
             return false;
         }
@@ -122,7 +126,7 @@ public class FeedItemMenuHandler {
      * @return true if selectedItem is not null.
      */
     public static boolean onPrepareMenu(MenuInterface mi,
-                                        FeedItem selectedItem, boolean showExtendedMenu, QueueAccess queueAccess, int... excludeIds) {
+                                        FeedItem selectedItem, boolean showExtendedMenu, LongList queueAccess, int... excludeIds) {
         boolean rc = onPrepareMenu(mi, selectedItem, showExtendedMenu, queueAccess);
         if (rc && excludeIds != null) {
             for (int id : excludeIds) {
@@ -156,15 +160,33 @@ public class FeedItemMenuHandler {
                 break;
             case R.id.mark_read_item:
                 DBWriter.markItemRead(context, selectedItem, true, true);
+                if(GpodnetPreferences.loggedIn()) {
+                    FeedMedia media = selectedItem.getMedia();
+                    GpodnetEpisodeAction actionPlay = new GpodnetEpisodeAction.Builder(selectedItem, Action.PLAY)
+                            .currentDeviceId()
+                            .currentTimestamp()
+                            .started(media.getDuration() / 1000)
+                            .position(media.getDuration() / 1000)
+                            .total(media.getDuration() / 1000)
+                            .build();
+                    GpodnetPreferences.enqueueEpisodeAction(actionPlay);
+                }
                 break;
             case R.id.mark_unread_item:
                 DBWriter.markItemRead(context, selectedItem, false, true);
+                if(GpodnetPreferences.loggedIn()) {
+                    GpodnetEpisodeAction actionNew = new GpodnetEpisodeAction.Builder(selectedItem, Action.NEW)
+                            .currentDeviceId()
+                            .currentTimestamp()
+                            .build();
+                    GpodnetPreferences.enqueueEpisodeAction(actionNew);
+                }
                 break;
             case R.id.add_to_queue_item:
                 DBWriter.addQueueItem(context, selectedItem.getId());
                 break;
             case R.id.remove_from_queue_item:
-                DBWriter.removeQueueItem(context, selectedItem.getId(), true);
+                DBWriter.removeQueueItem(context, selectedItem, true);
                 break;
             case R.id.stream_item:
                 DBTasks.playMedia(context, selectedItem.getMedia(), true, true,
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 227ea8dfb..32683c65c 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -343,6 +343,7 @@ public class PreferenceController {
             }
         });
         buildUpdateIntervalPreference();
+        buildSmartMarkAsPlayedPreference();
         buildAutodownloadSelectedNetworsPreference();
         setSelectedNetworksEnabled(UserPreferences
                 .isEnableAutodownloadWifiFilter());
@@ -403,6 +404,24 @@ public class PreferenceController {
 
     }
 
+    private void buildSmartMarkAsPlayedPreference() {
+        final Resources res = ui.getActivity().getResources();
+
+        ListPreference pref = (ListPreference) ui.findPreference(UserPreferences.PREF_SMART_MARK_AS_PLAYED_SECS);
+        String[] values = res.getStringArray(
+                R.array.smart_mark_as_played_values);
+        String[] entries = new String[values.length];
+        for (int x = 0; x < values.length; x++) {
+            if(x == 0) {
+                entries[x] = res.getString(R.string.pref_smart_mark_as_played_disabled);
+            } else {
+                Integer v = Integer.parseInt(values[x]);
+                entries[x] = v + " " + res.getString(R.string.time_unit_seconds);
+            }
+        }
+        pref.setEntries(entries);
+    }
+
     private void setSelectedNetworksEnabled(boolean b) {
         if (selectedNetworks != null) {
             for (Preference p : selectedNetworks) {
@@ -430,7 +449,6 @@ public class PreferenceController {
                 .setEnabled(UserPreferences.isEnableAutodownload());
     }
 
-
     private void setParallelDownloadsText(int downloads) {
         final Resources res = ui.getActivity().getResources();
 
diff --git a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
index 55dfdc20b..1d9e8e412 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
@@ -12,14 +12,18 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.RemoteViews;
-import de.danoeh.antennapod.core.BuildConfig;
+
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.receiver.MediaButtonReceiver;
-import de.danoeh.antennapod.receiver.PlayerWidget;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.service.playback.PlayerStatus;
+import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.receiver.PlayerWidget;
 
 /** Updates the state of the player widget */
 public class PlayerWidgetService extends Service {
@@ -39,8 +43,7 @@ public class PlayerWidgetService extends Service {
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		if (BuildConfig.DEBUG)
-			Log.d(TAG, "Service created");
+		Log.d(TAG, "Service created");
 		isUpdating = false;
         psLock = new Object();
 	}
@@ -48,8 +51,24 @@ public class PlayerWidgetService extends Service {
 	@Override
 	public void onDestroy() {
 		super.onDestroy();
-		if (BuildConfig.DEBUG)
-			Log.d(TAG, "Service is about to be destroyed");
+		Log.d(TAG, "Service is about to be destroyed");
+
+		Playable playable = playbackService.getPlayable();
+		if(playable != null && playable instanceof FeedMedia) {
+			FeedMedia media = (FeedMedia) playable;
+			if(media.hasAlmostEnded()) {
+				Log.d(TAG, "smart mark as read");
+				FeedItem item = media.getItem();
+				DBWriter.markItemRead(this, item, true, false);
+				DBWriter.removeQueueItem(this, item, false);
+				DBWriter.addItemToPlaybackHistory(this, media);
+				if (UserPreferences.isAutoDelete()) {
+					Log.d(TAG, "Delete " + media.toString());
+					DBWriter.deleteFeedMediaOfItem(this, media.getId());
+				}
+			}
+		}
+
 		try {
 			unbindService(mConnection);
 		} catch (IllegalArgumentException e) {
@@ -72,9 +91,7 @@ public class PlayerWidgetService extends Service {
 				startViewUpdaterIfNotRunning();
 			}
 		} else {
-			if (BuildConfig.DEBUG)
-				Log.d(TAG,
-						"Service was called while updating. Ignoring update request");
+			Log.d(TAG, "Service was called while updating. Ignoring update request");
 		}
 		return Service.START_NOT_STICKY;
 	}
@@ -153,8 +170,7 @@ public class PlayerWidgetService extends Service {
 
 	private ServiceConnection mConnection = new ServiceConnection() {
 		public void onServiceConnected(ComponentName className, IBinder service) {
-			if (BuildConfig.DEBUG)
-				Log.d(TAG, "Connection to service established");
+			Log.d(TAG, "Connection to service established");
             synchronized (psLock) {
                 playbackService = ((PlaybackService.LocalBinder) service)
                         .getService();
@@ -166,8 +182,7 @@ public class PlayerWidgetService extends Service {
 		public void onServiceDisconnected(ComponentName name) {
             synchronized (psLock) {
                 playbackService = null;
-                if (BuildConfig.DEBUG)
-                    Log.d(TAG, "Disconnected from service");
+                Log.d(TAG, "Disconnected from service");
             }
 		}