From 008347313f0481e2096b70e2d494055d9e9ebb66 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Tue, 4 Aug 2015 21:09:55 -0400
Subject: [PATCH 1/3] 'feeditem' is the id of the FeedItem

SQL statement previously used 'id' which was actually
the id of the FeedMedia item and not the FeedItem
---
 .../java/de/danoeh/antennapod/core/storage/PodDBAdapter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f9ac39349..904a416df 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
@@ -1711,7 +1711,7 @@ public class PodDBAdapter {
             }
             if(oldVersion < 1030002) {
                 db.execSQL("UPDATE FeedItems SET auto_download=0 WHERE " +
-                        "(read=1 OR id IN (SELECT id FROM FeedMedia WHERE position>0 OR downloaded=1)) " +
+                        "(read=1 OR id IN (SELECT feeditem FROM FeedMedia WHERE position>0 OR downloaded=1)) " +
                         "AND id NOT IN (SELECT feeditem FROM Queue)");
             }
             EventBus.getDefault().post(ProgressEvent.end());

From fe6796f102bb8c126cfad80d957bffe0cb04fa34 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Tue, 4 Aug 2015 21:25:25 -0400
Subject: [PATCH 2/3] Updated version code for RC5

Also updated the oldVersion used by the UPDATE FeedItems sql statement.
We don't want to run the 1030002 version ever, and the 1030005 version
should fix any users that used the 1030002 version (with the possibility
that some items that shouldn't have had auto_download set to 0 did have
it set to 0, but accepting that that's not a terrible problem).
---
 app/src/main/AndroidManifest.xml                              | 4 ++--
 .../java/de/danoeh/antennapod/core/storage/PodDBAdapter.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d59cca51c..79c5ee6a4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.danoeh.antennapod"
-    android:versionCode="1030004"
-    android:versionName="1.3-RC4">
+    android:versionCode="1030005"
+    android:versionName="1.3-RC5">
     <!--
       Version code schema:
       "1.2.3-SNAPSHOT" -> 1020300
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 904a416df..edb7598ab 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
@@ -1709,7 +1709,7 @@ public class PodDBAdapter {
                 db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
                         + " ADD COLUMN " + PodDBAdapter.KEY_AUTO_DELETE_ACTION + " INTEGER DEFAULT 0");
             }
-            if(oldVersion < 1030002) {
+            if(oldVersion < 1030005) {
                 db.execSQL("UPDATE FeedItems SET auto_download=0 WHERE " +
                         "(read=1 OR id IN (SELECT feeditem FROM FeedMedia WHERE position>0 OR downloaded=1)) " +
                         "AND id NOT IN (SELECT feeditem FROM Queue)");

From 224832300f4a8d0b42e257a23f0ae69957518a01 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Tue, 4 Aug 2015 22:09:53 -0400
Subject: [PATCH 3/3] only autodownload new items

---
 .../core/service/download/DownloadService.java       |  7 ++++++-
 .../antennapod/core/storage/APDownloadAlgorithm.java | 12 ++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

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 19a710d24..4fdaf6843 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
@@ -325,6 +325,11 @@ public class DownloadService extends Service {
         cancelNotificationUpdater();
         unregisterReceiver(cancelDownloadReceiver);
 
+        // TODO: I'm not sure this is actually needed.
+        // We could just invoke the autodownloadUndownloadeditems method
+        // and it would get everything it's supposed to.  By sending it the
+        // items in newMediaFiles we're overriding the download algorithm,
+        // which is not something we should probably do.
         if (!newMediaFiles.isEmpty()) {
             Log.d(TAG, "newMediaFiles exist, autodownload them");
             DBTasks.autodownloadUndownloadedItems(getApplicationContext(),
@@ -783,7 +788,7 @@ public class DownloadService extends Service {
                                 if(item.getPubDate() == null) {
                                     Log.d(TAG, item.toString());
                                 }
-                                if (!item.isPlayed() && item.hasMedia() && !item.getMedia().isDownloaded()) {
+                                if (item.isNew() && item.hasMedia() && !item.getMedia().isDownloaded()) {
                                     newMediaFiles.add(item.getMedia().getId());
                                 }
                             }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java b/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
index 0e6b23696..c2e971dce 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
@@ -22,7 +22,7 @@ public class APDownloadAlgorithm implements AutomaticDownloadAlgorithm {
     private final APCleanupAlgorithm cleanupAlgorithm = new APCleanupAlgorithm();
 
     /**
-     * Looks for undownloaded episodes in the queue or list of unread items and request a download if
+     * Looks for undownloaded episodes in the queue or list of new items and request a download if
      * 1. Network is available
      * 2. The device is charging or the user allows auto download on battery
      * 3. There is free space in the episode cache
@@ -57,12 +57,12 @@ public class APDownloadAlgorithm implements AutomaticDownloadAlgorithm {
                         candidates = DBReader.getFeedItems(context, mediaIds);
                     } else {
                         final List<FeedItem> queue = DBReader.getQueue(context);
-                        final List<FeedItem> unreadItems = DBReader.getUnreadItemsList(context);
-                        candidates = new ArrayList<FeedItem>(queue.size() + unreadItems.size());
+                        final List<FeedItem> newItems = DBReader.getNewItemsList(context);
+                        candidates = new ArrayList<FeedItem>(queue.size() + newItems.size());
                         candidates.addAll(queue);
-                        for(FeedItem unreadItem : unreadItems) {
-                            if(candidates.contains(unreadItem) == false) {
-                                candidates.add(unreadItem);
+                        for(FeedItem newItem : newItems) {
+                            if(candidates.contains(newItem) == false) {
+                                candidates.add(newItem);
                             }
                         }
                     }