Merge pull request #994 from mfietz/redesign-new-state

Drawer: Feed context menu, counter and order

15 files changed, 149 insertions, 240 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 b59f6ba35..cae29db4b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -1,5 +1,6 @@
 package de.danoeh.antennapod.activity;
 
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
@@ -13,6 +14,8 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.view.ContextMenu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -31,6 +34,8 @@ import org.apache.commons.lang3.StringUtils;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.ChapterListAdapter;
 import de.danoeh.antennapod.adapter.NavListAdapter;
+import de.danoeh.antennapod.core.asynctask.FeedRemover;
+import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.feed.Chapter;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
@@ -39,6 +44,7 @@ import de.danoeh.antennapod.core.feed.SimpleChapter;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.playback.ExternalMedia;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
@@ -430,6 +436,7 @@ public class AudioplayerActivity extends MediaplayerActivity implements ItemDesc
                 drawerLayout.closeDrawer(navDrawer);
             }
         });
+        registerForContextMenu(navList);
         drawerToggle.syncState();
 
         findViewById(R.id.nav_settings).setOnClickListener(new View.OnClickListener() {
@@ -634,6 +641,65 @@ public class AudioplayerActivity extends MediaplayerActivity implements ItemDesc
         }
     }
 
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+        super.onCreateContextMenu(menu, v, menuInfo);
+        if(v.getId() != R.id.nav_list) {
+            return;
+        }
+        AdapterView.AdapterContextMenuInfo adapterInfo = (AdapterView.AdapterContextMenuInfo) menuInfo;
+        int position = adapterInfo.position;
+        if(position < navAdapter.getSubscriptionOffset()) {
+            return;
+        }
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.nav_feed_context, menu);
+        Feed feed = navDrawerData.feeds.get(position - navAdapter.getSubscriptionOffset());
+        menu.setHeaderTitle(feed.getTitle());
+        // episodes are not loaded, so we cannot check if the podcast has new or unplayed ones!
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        AdapterView.AdapterContextMenuInfo menuInfo = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
+        if(menuInfo.targetView.getParent() instanceof ListView == false
+                || ((ListView)menuInfo.targetView.getParent()).getId() != R.id.nav_list) {
+            return false;
+        }
+        int position = menuInfo.position;
+        Feed feed = navDrawerData.feeds.get(position - navAdapter.getSubscriptionOffset());
+        switch(item.getItemId()) {
+            case R.id.mark_all_seen_item:
+                DBWriter.markFeedSeen(this, feed.getId());
+                return true;
+            case R.id.mark_all_read_item:
+                DBWriter.markFeedRead(this, feed.getId());
+                return true;
+            case R.id.remove_item:
+                final FeedRemover remover = new FeedRemover(this, feed) {
+                    @Override
+                    protected void onPostExecute(Void result) {
+                        super.onPostExecute(result);
+                    }
+                };
+                ConfirmationDialog conDialog = new ConfirmationDialog(this,
+                        R.string.remove_feed_label,
+                        R.string.feed_delete_confirmation_msg) {
+                    @Override
+                    public void onConfirmButtonPressed(
+                            DialogInterface dialog) {
+                        dialog.dismiss();
+                        remover.executeAsync();
+                    }
+                };
+                conDialog.createNewDialog().show();
+                return true;
+            default:
+                return super.onContextItemSelected(item);
+        }
+    }
+
+
     private DBReader.NavDrawerData navDrawerData;
     private AsyncTask<Void, Void, DBReader.NavDrawerData> loadTask;
 
@@ -708,8 +774,8 @@ public class AudioplayerActivity extends MediaplayerActivity implements ItemDesc
         }
 
         @Override
-        public int getNumberOfUnreadFeedItems(long feedId) {
-            return (navDrawerData != null) ? navDrawerData.numUnreadFeedItems.get(feedId) : 0;
+        public int getFeedCounter(long feedId) {
+            return navDrawerData != null ? navDrawerData.feedCounters.get(feedId) : 0;
         }
     };
 }
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 5b80b8f9d..acb56dcb4 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -20,6 +20,8 @@ import android.support.v7.app.ActionBarActivity;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.view.ContextMenu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
@@ -32,12 +34,15 @@ import java.util.List;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.NavListAdapter;
+import de.danoeh.antennapod.core.asynctask.FeedRemover;
+import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.event.ProgressEvent;
 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.storage.DBWriter;
 import de.danoeh.antennapod.core.util.StorageUtils;
 import de.danoeh.antennapod.fragment.AddFeedFragment;
 import de.danoeh.antennapod.fragment.AllEpisodesFragment;
@@ -140,6 +145,7 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
         navList.setAdapter(navAdapter);
         navList.setOnItemClickListener(navListClickListener);
         navList.setOnItemLongClickListener(newListLongClickListener);
+        registerForContextMenu(navList);
 
         navAdapter.registerDataSetObserver(new DataSetObserver() {
             @Override
@@ -493,6 +499,64 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
         }
     }
 
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+        super.onCreateContextMenu(menu, v, menuInfo);
+        if(v.getId() != R.id.nav_list) {
+            return;
+        }
+        AdapterView.AdapterContextMenuInfo adapterInfo = (AdapterView.AdapterContextMenuInfo) menuInfo;
+        int position = adapterInfo.position;
+        if(position < navAdapter.getSubscriptionOffset()) {
+            return;
+        }
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.nav_feed_context, menu);
+        Feed feed = navDrawerData.feeds.get(position - navAdapter.getSubscriptionOffset());
+        menu.setHeaderTitle(feed.getTitle());
+        // episodes are not loaded, so we cannot check if the podcast has new or unplayed ones!
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        AdapterView.AdapterContextMenuInfo menuInfo = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
+        if(menuInfo.targetView.getParent() instanceof ListView == false
+                || ((ListView)menuInfo.targetView.getParent()).getId() != R.id.nav_list) {
+            return false;
+        }
+        int position = menuInfo.position;
+        Feed feed = navDrawerData.feeds.get(position - navAdapter.getSubscriptionOffset());
+        switch(item.getItemId()) {
+            case R.id.mark_all_seen_item:
+                DBWriter.markFeedSeen(this, feed.getId());
+                return true;
+            case R.id.mark_all_read_item:
+                DBWriter.markFeedRead(this, feed.getId());
+                return true;
+            case R.id.remove_item:
+                final FeedRemover remover = new FeedRemover(this, feed) {
+                    @Override
+                    protected void onPostExecute(Void result) {
+                        super.onPostExecute(result);
+                    }
+                };
+                ConfirmationDialog conDialog = new ConfirmationDialog(this,
+                        R.string.remove_feed_label,
+                        R.string.feed_delete_confirmation_msg) {
+                    @Override
+                    public void onConfirmButtonPressed(
+                            DialogInterface dialog) {
+                        dialog.dismiss();
+                        remover.executeAsync();
+                    }
+                };
+                conDialog.createNewDialog().show();
+                return true;
+            default:
+                return super.onContextItemSelected(item);
+        }
+    }
+
     private DBReader.NavDrawerData navDrawerData;
     private AsyncTask<Void, Void, DBReader.NavDrawerData> loadTask;
     private int selectedNavListIndex = 0;
@@ -532,8 +596,8 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
         }
 
         @Override
-        public int getNumberOfUnreadFeedItems(long feedId) {
-            return (navDrawerData != null) ? navDrawerData.numUnreadFeedItems.get(feedId) : 0;
+        public int getFeedCounter(long feedId) {
+            return navDrawerData != null ? navDrawerData.feedCounters.get(feedId) : 0;
         }
 
     };
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
index 8e347a819..aca2b359a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
@@ -88,7 +88,7 @@ public class ActionButtonUtils {
                 butSecondary.setContentDescription(context.getString(labels[0]));
             }
         } else {
-            if (item.isRead()) {
+            if (item.isPlayed()) {
                 butSecondary.setVisibility(View.INVISIBLE);
             } else {
                 butSecondary.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java
index d96326053..bc3d3abbc 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java
@@ -91,7 +91,7 @@ public class AllEpisodesListAdapter extends BaseAdapter {
 
         holder.title.setText(item.getTitle());
         holder.pubDate.setText(DateUtils.formatDateTime(context, item.getPubDate().getTime(), DateUtils.FORMAT_ABBREV_ALL));
-        if (showOnlyNewEpisodes || item.isRead() || false == itemAccess.isNew(item)) {
+        if (showOnlyNewEpisodes || false == item.isNew()) {
             holder.statusUnread.setVisibility(View.INVISIBLE);
         } else {
             holder.statusUnread.setVisibility(View.VISIBLE);
@@ -179,7 +179,5 @@ public class AllEpisodesListAdapter extends BaseAdapter {
 
         boolean isInQueue(FeedItem item);
 
-        boolean isNew(FeedItem item);
-
     }
 }
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 4d6279560..c34d90a30 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -95,7 +95,7 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
                 }
             }
         } else {
-            if (!item.isRead()) {
+            if (!item.isPlayed()) {
                 DBWriter.markItemRead(context, item, true, true);
             }
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index b39e23d42..1ecc45210 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -112,12 +112,12 @@ public class FeedItemlistAdapter extends BaseAdapter {
             }
             holder.title.setText(buffer.toString());
 
-            if(false == item.isRead() && itemAccess.isNew(item)) {
+            if(item.isNew()) {
                 holder.statusUnread.setVisibility(View.VISIBLE);
             } else {
                 holder.statusUnread.setVisibility(View.INVISIBLE);
             }
-            if(item.isRead()) {
+            if(item.isPlayed()) {
                 ViewHelper.setAlpha(convertView, 0.5f);
             } else {
                 ViewHelper.setAlpha(convertView, 1.0f);
@@ -221,8 +221,6 @@ public class FeedItemlistAdapter extends BaseAdapter {
 
         FeedItem getItem(int position);
 
-        boolean isNew(FeedItem item);
-
     }
 
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 0d2d5cfa0..444d08da9 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -276,10 +276,10 @@ public class NavListAdapter extends BaseAdapter
             p.addRule(RelativeLayout.LEFT_OF, R.id.txtvCount);
             holder.failure.setVisibility(View.GONE);
         }
-        int feedUnreadItems = itemAccess.getNumberOfUnreadFeedItems(feed.getId());
-        if(feedUnreadItems > 0) {
+        int counter = itemAccess.getFeedCounter(feed.getId());
+        if(counter > 0) {
             holder.count.setVisibility(View.VISIBLE);
-            holder.count.setText(String.valueOf(feedUnreadItems));
+            holder.count.setText(String.valueOf(counter));
             holder.count.setTypeface(holder.title.getTypeface());
         } else {
             holder.count.setVisibility(View.GONE);
@@ -306,7 +306,7 @@ public class NavListAdapter extends BaseAdapter
         int getSelectedItemIndex();
         int getQueueSize();
         int getNumberOfNewItems();
-        int getNumberOfUnreadFeedItems(long feedId);
+        int getFeedCounter(long feedId);
     }
 
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java b/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java
index 10666aa36..932b9d22f 100644
--- a/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java
+++ b/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java
@@ -14,7 +14,6 @@ public class ClientConfigurator {
         ClientConfig.downloadServiceCallbacks = new DownloadServiceCallbacksImpl();
         ClientConfig.gpodnetCallbacks = new GpodnetCallbacksImpl();
         ClientConfig.playbackServiceCallbacks = new PlaybackServiceCallbacksImpl();
-        ClientConfig.storageCallbacks = new StorageCallbacksImpl();
         ClientConfig.flattrCallbacks = new FlattrCallbacksImpl();
         ClientConfig.dbTasksCallbacks = new DBTasksCallbacksImpl();
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/config/StorageCallbacksImpl.java b/app/src/main/java/de/danoeh/antennapod/config/StorageCallbacksImpl.java
deleted file mode 100644
index d8fab34c8..000000000
--- a/app/src/main/java/de/danoeh/antennapod/config/StorageCallbacksImpl.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package de.danoeh.antennapod.config;
-
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.media.MediaMetadataRetriever;
-import android.util.Log;
-
-import de.danoeh.antennapod.core.StorageCallbacks;
-import de.danoeh.antennapod.core.storage.PodDBAdapter;
-
-public class StorageCallbacksImpl implements StorageCallbacks {
-
-    @Override
-    public int getDatabaseVersion() {
-        return 16;
-    }
-
-    @Override
-    public void onUpgrade(final SQLiteDatabase db, int oldVersion, int newVersion) {
-        Log.w("DBAdapter", "Upgrading from version " + oldVersion + " to "
-                + newVersion + ".");
-        if (oldVersion <= 1) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS + " ADD COLUMN "
-                    + PodDBAdapter.KEY_TYPE + " TEXT");
-        }
-        if (oldVersion <= 2) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_LINK + " TEXT");
-        }
-        if (oldVersion <= 3) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_ITEM_IDENTIFIER + " TEXT");
-        }
-        if (oldVersion <= 4) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS + " ADD COLUMN "
-                    + PodDBAdapter.KEY_FEED_IDENTIFIER + " TEXT");
-        }
-        if (oldVersion <= 5) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_DOWNLOAD_LOG
-                    + " ADD COLUMN " + PodDBAdapter.KEY_REASON_DETAILED + " TEXT");
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_DOWNLOAD_LOG
-                    + " ADD COLUMN " + PodDBAdapter.KEY_DOWNLOADSTATUS_TITLE + " TEXT");
-        }
-        if (oldVersion <= 6) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_CHAPTER_TYPE + " INTEGER");
-        }
-        if (oldVersion <= 7) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                    + " ADD COLUMN " + PodDBAdapter.KEY_PLAYBACK_COMPLETION_DATE
-                    + " INTEGER");
-        }
-        if (oldVersion <= 8) {
-            final int KEY_ID_POSITION = 0;
-            final int KEY_MEDIA_POSITION = 1;
-
-            // Add feeditem column to feedmedia table
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                    + " ADD COLUMN " + PodDBAdapter.KEY_FEEDITEM
-                    + " INTEGER");
-            Cursor feeditemCursor = db.query(PodDBAdapter.TABLE_NAME_FEED_ITEMS,
-                    new String[]{PodDBAdapter.KEY_ID, PodDBAdapter.KEY_MEDIA}, "? > 0",
-                    new String[]{PodDBAdapter.KEY_MEDIA}, null, null, null);
-            if (feeditemCursor.moveToFirst()) {
-                db.beginTransaction();
-                ContentValues contentValues = new ContentValues();
-                do {
-                    long mediaId = feeditemCursor.getLong(KEY_MEDIA_POSITION);
-                    contentValues.put(PodDBAdapter.KEY_FEEDITEM, feeditemCursor.getLong(KEY_ID_POSITION));
-                    db.update(PodDBAdapter.TABLE_NAME_FEED_MEDIA, contentValues, PodDBAdapter.KEY_ID + "=?", new String[]{String.valueOf(mediaId)});
-                    contentValues.clear();
-                } while (feeditemCursor.moveToNext());
-                db.setTransactionSuccessful();
-                db.endTransaction();
-            }
-            feeditemCursor.close();
-        }
-        if (oldVersion <= 9) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_AUTO_DOWNLOAD
-                    + " INTEGER DEFAULT 1");
-        }
-        if (oldVersion <= 10) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_FLATTR_STATUS
-                    + " INTEGER");
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_FLATTR_STATUS
-                    + " INTEGER");
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                    + " ADD COLUMN " + PodDBAdapter.KEY_PLAYED_DURATION
-                    + " INTEGER");
-        }
-        if (oldVersion <= 11) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_USERNAME
-                    + " TEXT");
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_PASSWORD
-                    + " TEXT");
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_IMAGE
-                    + " INTEGER");
-        }
-        if (oldVersion <= 12) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_IS_PAGED + " INTEGER DEFAULT 0");
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_NEXT_PAGE_LINK + " TEXT");
-        }
-        if (oldVersion <= 13) {
-            // remove duplicate rows in "Chapters" table that were created because of a bug.
-            db.execSQL(String.format("DELETE FROM %s WHERE %s NOT IN " +
-                            "(SELECT MIN(%s) as %s FROM %s GROUP BY %s,%s,%s,%s,%s)",
-                    PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS,
-                    PodDBAdapter.KEY_ID,
-                    PodDBAdapter.KEY_ID,
-                    PodDBAdapter.KEY_ID,
-                    PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS,
-                    PodDBAdapter.KEY_TITLE,
-                    PodDBAdapter.KEY_START,
-                    PodDBAdapter.KEY_FEEDITEM,
-                    PodDBAdapter.KEY_LINK,
-                    PodDBAdapter.KEY_CHAPTER_TYPE));
-        }
-        if(oldVersion <= 14) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_AUTO_DOWNLOAD + " INTEGER");
-            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                    + " SET " + PodDBAdapter.KEY_AUTO_DOWNLOAD + " = "
-                    + "(SELECT " + PodDBAdapter.KEY_AUTO_DOWNLOAD
-                    + " FROM " + PodDBAdapter.TABLE_NAME_FEEDS
-                    + " WHERE " + PodDBAdapter.TABLE_NAME_FEEDS + "." + PodDBAdapter.KEY_ID
-                    + " = " + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + PodDBAdapter.KEY_FEED + ")");
-
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_HIDE + " TEXT");
-            
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                    + " ADD COLUMN " + PodDBAdapter.KEY_LAST_UPDATE_FAILED + " INTEGER DEFAULT 0");
-
-            // create indexes
-            db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDITEMS_FEED);
-            db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDITEMS_IMAGE);
-            db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDMEDIA_FEEDITEM);
-            db.execSQL(PodDBAdapter.CREATE_INDEX_QUEUE_FEEDITEM);
-            db.execSQL(PodDBAdapter.CREATE_INDEX_SIMPLECHAPTERS_FEEDITEM);
-        }
-        if(oldVersion <= 15) {
-            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                    + " ADD COLUMN " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + " INTEGER DEFAULT -1");
-            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                    + " SET " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=0"
-                    + " WHERE " + PodDBAdapter.KEY_DOWNLOADED + "=0");
-            Cursor c = db.rawQuery("SELECT " + PodDBAdapter.KEY_FILE_URL
-                    + " FROM " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                    + " WHERE " + PodDBAdapter.KEY_DOWNLOADED + "=1 "
-                    + " AND " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=-1", null);
-            if(c.moveToFirst()) {
-                MediaMetadataRetriever mmr = new MediaMetadataRetriever();
-                do {
-                    String fileUrl = c.getString(0);
-                    try {
-                        mmr.setDataSource(fileUrl);
-                        byte[] image = mmr.getEmbeddedPicture();
-                        if (image != null) {
-                            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                                    + " SET " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=1"
-                                    + " WHERE " + PodDBAdapter.KEY_FILE_URL + "='"+ fileUrl + "'");
-                        } else {
-                            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                                    + " SET " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=0"
-                                    + " WHERE " + PodDBAdapter.KEY_FILE_URL + "='"+ fileUrl + "'");
-                        }
-                    } catch(Exception e) {
-                        e.printStackTrace();
-                    }
-                } while(c.moveToNext());
-            }
-            c.close();
-        }
-    }
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index 1ca5b831c..8a4a4efbf 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -5,8 +5,6 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -316,7 +314,7 @@ public class EpisodesApplyActionFragment extends Fragment {
 
     private void checkPlayed(boolean isPlayed) {
         for (FeedItem episode : episodes) {
-            if(episode.isRead() == isPlayed) {
+            if(episode.isPlayed() == isPlayed) {
                 if(!checkedIds.contains(episode.getId())) {
                     checkedIds.add(episode.getId());
                 }
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 e48b175e8..b4c4f1822 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -76,7 +76,6 @@ public class AllEpisodesFragment extends Fragment {
 
     private List<FeedItem> episodes;
     private LongList queuedItemsIds;
-    private LongList newItemsIds;
     private List<Downloader> downloaderList;
 
     private boolean itemsLoaded = false;
@@ -432,18 +431,6 @@ public class AllEpisodesFragment extends Fragment {
                 return false;
             }
         }
-
-        @Override
-        public boolean isNew(FeedItem item) {
-            if (itemsLoaded) {
-                // should actually never be called in NewEpisodesFragment, but better safe than sorry
-                return showOnlyNewEpisodes || newItemsIds.contains(item.getId());
-            } else {
-                return false;
-            }
-        }
-
-
     };
 
     private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
@@ -508,8 +495,7 @@ public class AllEpisodesFragment extends Fragment {
                 } else {
                     return new Object[]{
                             DBReader.getRecentlyPublishedEpisodes(context, RECENT_EPISODES_LIMIT),
-                            DBReader.getQueueIDList(context),
-                            DBReader.getNewItemIds(context)
+                            DBReader.getQueueIDList(context)
                     };
                 }
             } else {
@@ -526,7 +512,6 @@ public class AllEpisodesFragment extends Fragment {
             if (lists != null) {
                 episodes = (List<FeedItem>) lists[0];
                 queuedItemsIds = (LongList) lists[1];
-                newItemsIds = (LongList) lists[2];
                 itemsLoaded = true;
                 if (viewsCreated && activity.get() != null) {
                     onFragmentLoaded();
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 6e3b37133..e0ed3d02c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -355,7 +355,7 @@ public class ItemFragment extends Fragment implements LoaderManager.LoaderCallba
             TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.navigation_accept,
                     R.attr.location_web_site});
 
-            if (!item.isRead()) {
+            if (!item.isPlayed()) {
                 butAction1.setCompoundDrawablesWithIntrinsicBounds(drawables.getDrawable(0), null, null, null);
                 butAction1.setText(getActivity().getString(R.string.mark_read_label));
                 butAction1.setVisibility(View.VISIBLE);
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 797e5fb82..5862e248b 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -92,8 +92,6 @@ public class ItemlistFragment extends ListFragment {
     private long feedID;
     private Feed feed;
     private LongList queuedItemsIds;
-    private LongList newItemsIds;
-
 
     private boolean itemsLoaded = false;
     private boolean viewsCreated = false;
@@ -580,11 +578,6 @@ public class ItemlistFragment extends ListFragment {
         }
 
         @Override
-        public boolean isNew(FeedItem item) {
-            return (newItemsIds != null) && newItemsIds.contains(item.getId());
-        }
-
-        @Override
         public int getItemDownloadProgressPercent(FeedItem item) {
             if (downloaderList != null) {
                 for (Downloader downloader : downloaderList) {
@@ -626,8 +619,7 @@ public class ItemlistFragment extends ListFragment {
                     feed.setItems(filter.filter(context, feed.getItems()));
                 }
                 LongList queuedItemsIds = DBReader.getQueueIDList(context);
-                LongList newItemsIds = DBReader.getNewItemIds(context);
-                return new Object[] { feed, queuedItemsIds, newItemsIds };
+                return new Object[] { feed, queuedItemsIds };
             } else {
                 return null;
             }
@@ -639,7 +631,6 @@ public class ItemlistFragment extends ListFragment {
             if (res != null) {
                 feed = (Feed) res[0];
                 queuedItemsIds = (LongList) res[1];
-                newItemsIds = res[2] == null ? null : (LongList) res[2];
                 itemsLoaded = true;
                 if (viewsCreated) {
                     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 fc8bf2fbb..67f454fa0 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
@@ -219,11 +219,6 @@ public class PlaybackHistoryFragment extends ListFragment {
         }
 
         @Override
-        public boolean isNew(FeedItem item) {
-            return false;
-        }
-
-        @Override
         public int getItemDownloadProgressPercent(FeedItem item) {
             if (downloaderList != null) {
                 for (Downloader downloader : downloaderList) {
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 e3285fd53..3e2fdf24f 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -154,7 +154,7 @@ public class FeedItemMenuHandler {
                 DBWriter.deleteFeedMediaOfItem(context, selectedItem.getMedia().getId());
                 break;
             case R.id.mark_read_item:
-                selectedItem.setRead(true);
+                selectedItem.setPlayed(true);
                 DBWriter.markItemRead(context, selectedItem, true, false);
                 if(GpodnetPreferences.loggedIn()) {
                     FeedMedia media = selectedItem.getMedia();
@@ -172,7 +172,7 @@ public class FeedItemMenuHandler {
                 }
                 break;
             case R.id.mark_unread_item:
-                selectedItem.setRead(false);
+                selectedItem.setPlayed(false);
                 DBWriter.markItemRead(context, selectedItem, false, false);
                 if(GpodnetPreferences.loggedIn()) {
                     GpodnetEpisodeAction actionNew = new GpodnetEpisodeAction.Builder(selectedItem, Action.NEW)