Make new explicit

9 files changed, 85 insertions, 99 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
index 1168c60e4..e93aea9ac 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
@@ -44,7 +44,11 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
     private Feed feed;
     private long feedId;
 
-    private boolean read;
+    private int state;
+    public final static int NEW = -1;
+    public final static int UNPLAYED = 0;
+    public final static int PLAYED = 1;
+
     private String paymentLink;
     private FlattrStatus flattrStatus;
 
@@ -66,7 +70,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
     private boolean autoDownload = true;
 
     public FeedItem() {
-        this.read = true;
+        this.state = UNPLAYED;
         this.flattrStatus = new FlattrStatus();
         this.hasChapters = false;
     }
@@ -75,7 +79,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
      * This constructor is used by DBReader.
      * */
     public FeedItem(long id, String title, String link, Date pubDate, String paymentLink, long feedId,
-                    FlattrStatus flattrStatus, boolean hasChapters, FeedImage image, boolean read,
+                    FlattrStatus flattrStatus, boolean hasChapters, FeedImage image, int state,
                     String itemIdentifier, boolean autoDownload) {
         this.id = id;
         this.title = title;
@@ -86,7 +90,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
         this.flattrStatus = flattrStatus;
         this.hasChapters = hasChapters;
         this.image = image;
-        this.read = read;
+        this.state = state;
         this.itemIdentifier = itemIdentifier;
         this.autoDownload = autoDownload;
     }
@@ -94,13 +98,13 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
     /**
      * This constructor should be used for creating test objects.
      */
-    public FeedItem(long id, String title, String itemIdentifier, String link, Date pubDate, boolean read, Feed feed) {
+    public FeedItem(long id, String title, String itemIdentifier, String link, Date pubDate, int state, Feed feed) {
         this.id = id;
         this.title = title;
         this.itemIdentifier = itemIdentifier;
         this.link = link;
         this.pubDate = (pubDate != null) ? (Date) pubDate.clone() : null;
-        this.read = read;
+        this.state = state;
         this.feed = feed;
         this.flattrStatus = new FlattrStatus();
         this.hasChapters = false;
@@ -109,13 +113,13 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
     /**
      * This constructor should be used for creating test objects involving chapter marks.
      */
-    public FeedItem(long id, String title, String itemIdentifier, String link, Date pubDate, boolean read, Feed feed, boolean hasChapters) {
+    public FeedItem(long id, String title, String itemIdentifier, String link, Date pubDate, int read, Feed feed, boolean hasChapters) {
         this.id = id;
         this.title = title;
         this.itemIdentifier = itemIdentifier;
         this.link = link;
         this.pubDate = (pubDate != null) ? (Date) pubDate.clone() : null;
-        this.read = read;
+        this.state = state;
         this.feed = feed;
         this.flattrStatus = new FlattrStatus();
         this.hasChapters = hasChapters;
@@ -238,12 +242,25 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
         this.feed = feed;
     }
 
-    public boolean isRead() {
-        return read;
+    public boolean isNew() {
+        return state == NEW;
+    }
+
+
+    public void setNew() {
+        state = NEW;
+    }
+
+    public boolean isPlayed() {
+        return state == PLAYED;
     }
 
-    public void setRead(boolean read) {
-        this.read = read;
+    public void setPlayed(boolean played) {
+        if(played) {
+            state = PLAYED;
+        } else {
+            state = UNPLAYED;
+        }
     }
 
     private boolean isInProgress() {
@@ -342,7 +359,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
                 return State.IN_PROGRESS;
             }
         }
-        return (isRead() ? State.READ : State.UNREAD);
+        return (isPlayed() ? State.READ : State.UNREAD);
     }
 
     public long getFeedId() {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java
index 4ad084b39..2fd5666c8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java
@@ -61,9 +61,9 @@ public class FeedItemFilter {
         }
         List<FeedItem> result = new ArrayList<FeedItem>();
         for(FeedItem item : items) {
-            if(hideUnplayed && false == item.isRead()) continue;
+            if(hideUnplayed && false == item.isPlayed()) continue;
             if(hidePaused && item.getState() == FeedItem.State.IN_PROGRESS) continue;
-            if(hidePlayed && item.isRead()) continue;
+            if(hidePlayed && item.isPlayed()) continue;
             boolean isQueued = DBReader.getQueueIDList(context).contains(item.getId());
             if(hideQueued && isQueued) continue;
             if(hideNotQueued && false == isQueued) continue;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
index b4cca505c..bd5fc58b8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
@@ -186,6 +186,9 @@ public class FeedMedia extends FeedFile implements Playable {
 
     public void setPosition(int position) {
         this.position = position;
+        if(position > 0) {
+            this.item.setPlayed(false);
+        }
     }
 
     public long getSize() {
@@ -447,6 +450,9 @@ public class FeedMedia extends FeedFile implements Playable {
     @Override
     public void setDownloaded(boolean downloaded) {
         super.setDownloaded(downloaded);
+        if(downloaded) {
+            item.setPlayed(false);
+        }
     }
 
     @Override
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index 238cad763..7fb878680 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -815,7 +815,7 @@ public class DownloadService extends Service {
                                         e.printStackTrace();
                                     }
                                 }
-                                if (!item.isRead() && item.hasMedia() && !item.getMedia().isDownloaded()) {
+                                if (!item.isPlayed() && item.hasMedia() && !item.getMedia().isDownloaded()) {
                                     newMediaFiles.add(item.getMedia().getId());
                                 }
                             }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/APCleanupAlgorithm.java b/core/src/main/java/de/danoeh/antennapod/core/storage/APCleanupAlgorithm.java
index f647fd537..a07705e69 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/APCleanupAlgorithm.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/APCleanupAlgorithm.java
@@ -28,7 +28,7 @@ public class APCleanupAlgorithm implements EpisodeCleanupAlgorithm<Integer> {
         List<FeedItem> delete;
         for (FeedItem item : downloadedItems) {
             if (item.hasMedia() && item.getMedia().isDownloaded()
-                    && !queue.contains(item.getId()) && item.isRead()) {
+                    && !queue.contains(item.getId()) && item.isPlayed()) {
                 candidates.add(item);
             }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
index 95c033dc5..0347c1b72 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
@@ -229,7 +229,7 @@ public final class DBReader {
                         new FlattrStatus(itemlistCursor.getLong(PodDBAdapter.IDX_FI_SMALL_FLATTR_STATUS)),
                         itemlistCursor.getInt(PodDBAdapter.IDX_FI_SMALL_HAS_CHAPTERS) > 0,
                         image,
-                        (itemlistCursor.getInt(PodDBAdapter.IDX_FI_SMALL_READ) > 0),
+                        itemlistCursor.getInt(PodDBAdapter.IDX_FI_SMALL_READ),
                         itemlistCursor.getString(PodDBAdapter.IDX_FI_SMALL_ITEM_IDENTIFIER),
                         itemlistCursor.getInt(itemlistCursor.getColumnIndex(PodDBAdapter.KEY_AUTO_DOWNLOAD)) > 0
                         );
@@ -481,8 +481,7 @@ public final class DBReader {
      * Loads a list of FeedItems whose 'read'-attribute is set to false.
      *
      * @param context A context that is used for opening a database connection.
-     * @return A list of FeedItems whose 'read'-attribute it set to false. If the FeedItems in the list are not used,
-     * consider using {@link #getUnreadItemIds(android.content.Context)} instead.
+     * @return A list of FeedItems whose 'read'-attribute it set to false.
      */
     public static List<FeedItem> getUnreadItemsList(Context context) {
         if (BuildConfig.DEBUG)
@@ -1013,20 +1012,6 @@ public final class DBReader {
     }
 
     /**
-     * Returns a map containing the number of unread items per feed
-     *
-     * @param context A context that is used for opening a database connection.
-     * @return The number of unread items per feed.
-     */
-    public static LongIntMap getNumberOfUnreadFeedItems(final Context context, long... feedIds) {
-        PodDBAdapter adapter = new PodDBAdapter(context);
-        adapter.open();
-        final LongIntMap result = adapter.getNumberOfUnreadFeedItems(feedIds);
-        adapter.close();
-        return result;
-    }
-
-    /**
      * Searches the DB for a FeedImage of the given id.
      *
      * @param context A context that is used for opening a database connection.
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
index 711cd773e..9273cf11e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
@@ -561,7 +561,7 @@ public final class DBTasks {
                 // all new feeds will have the most recent item marked as unplayed
                 FeedItem mostRecent = newFeed.getMostRecentItem();
                 if (mostRecent != null) {
-                    mostRecent.setRead(false);
+                    mostRecent.setNew();
                 }
 
                 newFeedsList.add(newFeed);
@@ -572,16 +572,16 @@ public final class DBTasks {
 
                 Collections.sort(newFeed.getItems(), new FeedItemPubdateComparator());
 
-                final boolean markNewItemsAsUnread;
+                final boolean markNewItems;
                 if (newFeed.getPageNr() == savedFeed.getPageNr()) {
                     if (savedFeed.compareWithOther(newFeed)) {
                         Log.d(TAG, "Feed has updated attribute values. Updating old feed's attributes");
                         savedFeed.updateFromOther(newFeed);
                     }
-                    markNewItemsAsUnread = true;
+                    markNewItems = true;
                 } else {
                     Log.d(TAG, "New feed has a higher page number. Merging without marking as unread");
-                    markNewItemsAsUnread = false;
+                    markNewItems = false;
                     savedFeed.setNextPageLink(newFeed.getNextPageLink());
                 }
                 if (savedFeed.getPreferences().compareWithOther(newFeed.getPreferences())) {
@@ -599,8 +599,8 @@ public final class DBTasks {
                         item.setFeed(savedFeed);
                         item.setAutoDownload(savedFeed.getPreferences().getAutoDownload());
                         savedFeed.getItems().add(i, item);
-                        if (markNewItemsAsUnread) {
-                            item.setRead(false);
+                        if (markNewItems) {
+                            item.setNew();
                         }
                     } else {
                         oldItem.updateFromOther(item);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
index e103007e3..278d897b6 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
@@ -16,7 +16,6 @@ import java.net.URLEncoder;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -352,7 +351,7 @@ public class DBWriter {
                 final PodDBAdapter adapter = new PodDBAdapter(context);
                 adapter.open();
                 final List<FeedItem> queue = DBReader.getQueue(context, adapter);
-                FeedItem item = null;
+                FeedItem item;
 
                 if (queue != null) {
                     if (!itemListContains(queue, itemId)) {
@@ -403,23 +402,18 @@ public class DBWriter {
 
                     if (queue != null) {
                         boolean queueModified = false;
-                        boolean unreadItemsModified = false;
-                        List<FeedItem> itemsToSave = new LinkedList<FeedItem>();
                         for (int i = 0; i < itemIds.length; i++) {
                             if (!itemListContains(queue, itemIds[i])) {
-                                final FeedItem item = DBReader.getFeedItem(
-                                        context, itemIds[i]);
+                                final FeedItem item = DBReader.getFeedItem(context, itemIds[i]);
 
                                 if (item != null) {
                                     // add item to either front ot back of queue
                                     boolean addToFront = UserPreferences.enqueueAtFront();
-
                                     if(addToFront){
                                         queue.add(0+i, item);
                                     } else {
                                         queue.add(item);
                                     }
-
                                     queueModified = true;
                                 }
                             }
@@ -677,7 +671,7 @@ public class DBWriter {
                     itemCursor.moveToNext();
                 }
                 itemCursor.close();
-                adapter.setFeedItemRead(true, itemIds);
+                adapter.setFeedItemRead(FeedItem.PLAYED, itemIds);
                 adapter.close();
 
                 EventDistributor.getInstance().sendUnreadItemsUpdateBroadcast();
@@ -706,7 +700,7 @@ public class DBWriter {
                     itemCursor.moveToNext();
                 }
                 itemCursor.close();
-                adapter.setFeedItemRead(true, itemIds);
+                adapter.setFeedItemRead(FeedItem.PLAYED, itemIds);
                 adapter.close();
 
                 EventDistributor.getInstance().sendUnreadItemsUpdateBroadcast();
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
index ed3cb71e9..50df0f0a7 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
@@ -742,7 +742,13 @@ public class PodDBAdapter {
             setFeed(item.getFeed());
         }
         values.put(KEY_FEED, item.getFeed().getId());
-        values.put(KEY_READ, item.isRead());
+        if(item.isNew()) {
+            values.put(KEY_READ, FeedItem.NEW);
+        } else if(item.isPlayed()) {
+            values.put(KEY_READ, FeedItem.PLAYED);
+        } else {
+            values.put(KEY_READ, FeedItem.UNPLAYED);
+        }
         values.put(KEY_HAS_CHAPTERS, item.getChapters() != null || item.hasChapters());
         values.put(KEY_ITEM_IDENTIFIER, item.getItemIdentifier());
         values.put(KEY_FLATTR_STATUS, item.getFlattrStatus().toLong());
@@ -774,7 +780,7 @@ public class PodDBAdapter {
         db.beginTransaction();
         ContentValues values = new ContentValues();
 
-        values.put(KEY_READ, read);
+        values.put(KEY_READ, read ? FeedItem.PLAYED : FeedItem.UNPLAYED);
         db.update(TABLE_NAME_FEED_ITEMS, values, KEY_ID + "=?", new String[]{String.valueOf(itemId)});
 
         if (resetMediaPosition) {
@@ -787,7 +793,7 @@ public class PodDBAdapter {
         db.endTransaction();
     }
 
-    public void setFeedItemRead(boolean read, long... itemIds) {
+    public void setFeedItemRead(int read, long... itemIds) {
         db.beginTransaction();
         ContentValues values = new ContentValues();
         for (long id : itemIds) {
@@ -873,18 +879,23 @@ public class PodDBAdapter {
 
     public void setQueue(List<FeedItem> queue) {
         ContentValues values = new ContentValues();
+        long[] ids = new long[queue.size()];
         db.beginTransaction();
         db.delete(TABLE_NAME_QUEUE, null, null);
         for (int i = 0; i < queue.size(); i++) {
             FeedItem item = queue.get(i);
+            ids[i] = item.getId();
             values.put(KEY_ID, i);
             values.put(KEY_FEEDITEM, item.getId());
             values.put(KEY_FEED, item.getFeed().getId());
-            db.insertWithOnConflict(TABLE_NAME_QUEUE, null, values,
-                    SQLiteDatabase.CONFLICT_REPLACE);
+            db.insertWithOnConflict(TABLE_NAME_QUEUE, null, values, SQLiteDatabase.CONFLICT_REPLACE);
         }
         db.setTransactionSuccessful();
         db.endTransaction();
+        db.execSQL("UPDATE " + TABLE_NAME_FEED_ITEMS
+                + " SET " + KEY_READ + "=" + FeedItem.UNPLAYED
+                + " WHERE " + KEY_ID + " IN(" + TextUtils.join(",", Arrays.asList(ids)) + ")"
+                + " AND " + KEY_READ + "=" + FeedItem.NEW);
     }
 
     public void clearQueue() {
@@ -1059,6 +1070,7 @@ public class PodDBAdapter {
     /**
      * Returns a cursor which contains all feed items in the queue. The returned
      * cursor uses the FEEDITEM_SEL_FI_SMALL selection.
+     * cursor uses the FEEDITEM_SEL_FI_SMALL selection.
      */
     public final Cursor getQueueCursor() {
         Object[] args = (Object[]) new String[]{
@@ -1090,24 +1102,14 @@ public class PodDBAdapter {
      */
     public final Cursor getUnreadItemsCursor() {
         Cursor c = db.query(TABLE_NAME_FEED_ITEMS, FEEDITEM_SEL_FI_SMALL, KEY_READ
-                + "=0", null, null, null, KEY_PUBDATE + " DESC");
+                + "<" + FeedItem.PLAYED, null, null, null, KEY_PUBDATE + " DESC");
         return c;
     }
 
     public final Cursor getNewItemIdsCursor() {
-        final String query = "SELECT " + TABLE_NAME_FEED_ITEMS + "." + KEY_ID
+        final String query = "SELECT " + KEY_ID
                 + " FROM " + TABLE_NAME_FEED_ITEMS
-                + " INNER JOIN " + TABLE_NAME_FEED_MEDIA + " ON "
-                + TABLE_NAME_FEED_ITEMS + "." + KEY_ID + "="
-                + TABLE_NAME_FEED_MEDIA + "." + KEY_FEEDITEM
-                + " LEFT OUTER JOIN " + TABLE_NAME_QUEUE + " ON "
-                + TABLE_NAME_FEED_ITEMS + "." + KEY_ID + "="
-                + TABLE_NAME_QUEUE + "." + KEY_FEEDITEM
-                + " WHERE "
-                + TABLE_NAME_FEED_ITEMS + "." + KEY_READ + " = 0 AND " // unplayed
-                + TABLE_NAME_FEED_MEDIA + "." + KEY_DOWNLOADED + " = 0 AND " // undownloaded
-                + TABLE_NAME_FEED_MEDIA + "." + KEY_POSITION + " = 0 AND " // not partially played
-                + TABLE_NAME_QUEUE + "." + KEY_ID + " IS NULL"; // not in queue
+                + " WHERE " + KEY_READ + "=" + FeedItem.NEW;
         return db.rawQuery(query, null);
     }
 
@@ -1116,18 +1118,9 @@ public class PodDBAdapter {
      * The returned cursor uses the FEEDITEM_SEL_FI_SMALL selection.
      */
     public final Cursor getNewItemsCursor() {
-        final String query = "SELECT " + SEL_FI_SMALL_STR + " FROM " + TABLE_NAME_FEED_ITEMS
-                + " INNER JOIN " + TABLE_NAME_FEED_MEDIA + " ON "
-                + TABLE_NAME_FEED_ITEMS + "." + KEY_ID + "="
-                + TABLE_NAME_FEED_MEDIA + "." + KEY_FEEDITEM
-                + " LEFT OUTER JOIN " + TABLE_NAME_QUEUE + " ON "
-                + TABLE_NAME_FEED_ITEMS + "." + KEY_ID + "="
-                + TABLE_NAME_QUEUE + "." + KEY_FEEDITEM
-                + " WHERE "
-                + TABLE_NAME_FEED_ITEMS + "." + KEY_READ + " = 0 AND " // unplayed
-                + TABLE_NAME_FEED_MEDIA + "." + KEY_DOWNLOADED + " = 0 AND " // undownloaded
-                + TABLE_NAME_FEED_MEDIA + "." + KEY_POSITION + " = 0 AND " // not partially played
-                + TABLE_NAME_QUEUE + "." + KEY_ID + " IS NULL"  // not in queue
+        final String query = "SELECT " + SEL_FI_SMALL_STR
+                + " FROM " + TABLE_NAME_FEED_ITEMS
+                + " WHERE " + KEY_READ + "=" + FeedItem.NEW
                 + " ORDER BY " + KEY_PUBDATE + " DESC";
         Cursor c = db.rawQuery(query, null);
         return c;
@@ -1139,11 +1132,11 @@ public class PodDBAdapter {
     }
 
     public Cursor getDownloadedItemsCursor() {
-        final String query = "SELECT " + SEL_FI_SMALL_STR + " FROM " + TABLE_NAME_FEED_ITEMS
-                + " INNER JOIN " + TABLE_NAME_FEED_MEDIA + " ON "
-                + TABLE_NAME_FEED_ITEMS + "." + KEY_ID + "="
-                + TABLE_NAME_FEED_MEDIA + "." + KEY_FEEDITEM + " WHERE "
-                + TABLE_NAME_FEED_MEDIA + "." + KEY_DOWNLOADED + ">0";
+        final String query = "SELECT " + SEL_FI_SMALL_STR
+                + " FROM " + TABLE_NAME_FEED_ITEMS
+                + " INNER JOIN " + TABLE_NAME_FEED_MEDIA
+                + " ON " + TABLE_NAME_FEED_ITEMS + "." + KEY_ID + "=" + TABLE_NAME_FEED_MEDIA + "." + KEY_FEEDITEM
+                + " WHERE " + TABLE_NAME_FEED_MEDIA + "." + KEY_DOWNLOADED + ">0";
         Cursor c = db.rawQuery(query, null);
         return c;
     }
@@ -1277,19 +1270,9 @@ public class PodDBAdapter {
     }
 
     public final int getNumberOfNewItems() {
-        final String query = "SELECT COUNT(" + TABLE_NAME_FEED_ITEMS + "." + KEY_ID + ")"
-                +" FROM " + TABLE_NAME_FEED_ITEMS
-                + " LEFT JOIN " + TABLE_NAME_FEED_MEDIA + " ON "
-                + TABLE_NAME_FEED_ITEMS + "." + KEY_ID + "="
-                + TABLE_NAME_FEED_MEDIA + "." + KEY_FEEDITEM
-                + " LEFT JOIN " + TABLE_NAME_QUEUE + " ON "
-                + TABLE_NAME_FEED_ITEMS + "." + KEY_ID + "="
-                + TABLE_NAME_QUEUE + "." + KEY_FEEDITEM
-                + " WHERE "
-                + TABLE_NAME_FEED_ITEMS + "." + KEY_READ + " = 0 AND " // unplayed
-                + TABLE_NAME_FEED_MEDIA + "." + KEY_DOWNLOADED + " = 0 AND " // undownloaded
-                + TABLE_NAME_FEED_MEDIA + "." + KEY_POSITION + " = 0 AND " // not partially played
-                + TABLE_NAME_QUEUE + "." + KEY_ID + " IS NULL";  // not in queue
+        final String query = "SELECT COUNT(" + KEY_ID + ")"
+                + " FROM " + TABLE_NAME_FEED_ITEMS
+                + " WHERE " + KEY_READ + "=" + FeedItem.NEW;
         Cursor c = db.rawQuery(query, null);
         int result = 0;
         if (c.moveToFirst()) {
@@ -1315,7 +1298,8 @@ public class PodDBAdapter {
         final String query = "SELECT " + KEY_FEED + ", COUNT(" + KEY_ID + ") AS count "
                 + " FROM " + TABLE_NAME_FEED_ITEMS
                 + " WHERE " + KEY_FEED + " IN (" + builder.toString() + ") "
-                + " AND " + KEY_READ + " = 0"
+                + " AND (" + KEY_READ + "=" + FeedItem.NEW
+                + " OR " + KEY_READ  + "=" + FeedItem.UNPLAYED + ")"
                 + " GROUP BY " + KEY_FEED;
         Cursor c = db.rawQuery(query, null);
         LongIntMap result = new LongIntMap(c.getCount());