Updates based on QA feedback

6 files changed, 13 insertions, 12 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/FeedUpdateWorker.java b/core/src/main/java/de/danoeh/antennapod/core/service/FeedUpdateWorker.java
index 4443319e9..8811faf8a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/FeedUpdateWorker.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/FeedUpdateWorker.java
@@ -31,7 +31,7 @@ public class FeedUpdateWorker extends Worker {
         ClientConfig.initialize(getApplicationContext());
 
         if (NetworkUtils.networkAvailable() && NetworkUtils.isFeedRefreshAllowed()) {
-            DBTasks.refreshAllFeeds(getApplicationContext());
+            DBTasks.refreshAllFeeds(getApplicationContext(), false);
         } else {
             Log.d(TAG, "Blocking automatic update: no wifi available / no mobile updates allowed");
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
index ff6eb3c76..811b2374e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
@@ -107,10 +107,9 @@ public class DownloadServiceNotification {
         for (DownloadStatus status : reportQueue) {
             if (status.isSuccessful()) {
                 successfulDownloads++;
+                createReport = createReport || showAutoDownloadReport && !status.isInitiatedByUser() && status.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA;
             } else if (!status.isCancelled()) {
                 failedDownloads++;
-            }
-            if (failedDownloads > 0 || showAutoDownloadReport && !status.isInitiatedByUser() && status.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
                 createReport = true;
             }
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadStatus.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadStatus.java
index 78ac8ecea..6b21dd58c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadStatus.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadStatus.java
@@ -51,8 +51,7 @@ public class DownloadStatus {
 						  DownloadError reason,
 						  boolean successful,
 						  boolean cancelled,
-						  String reasonDetailed,
-						  boolean initiatedByUser) {
+						  String reasonDetailed) {
 		this(0,
 			 request.getTitle(),
 			 request.getFeedfileId(),
@@ -63,7 +62,7 @@ public class DownloadStatus {
 			 reason,
 			 new Date(),
 			 reasonDetailed,
-				initiatedByUser);
+			 request.isInitiatedByUser());
 	}
 
 	/** Constructor for creating new completed downloads. */
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/Downloader.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/Downloader.java
index 51190a82a..2a0989d23 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/Downloader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/Downloader.java
@@ -29,7 +29,7 @@ public abstract class Downloader implements Callable<Downloader> {
         this.request = request;
         this.request.setStatusMsg(R.string.download_pending);
         this.cancelled = false;
-        this.result = new DownloadStatus(request, null, false, false, null, request.isInitiatedByUser());
+        this.result = new DownloadStatus(request, null, false, false, null);
     }
 
     protected abstract void download();
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 9bad98135..0695b1d04 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
@@ -105,8 +105,9 @@ public final class DBTasks {
      * enqueuing Feeds for download from a previous call
      *
      * @param context  Might be used for accessing the database
+     * @param initiatedByUser a boolean indicating if the refresh was triggered by user action.
      */
-    public static void refreshAllFeeds(final Context context) {
+    public static void refreshAllFeeds(final Context context, boolean initiatedByUser) {
         if (!isRefreshing.compareAndSet(false, true)) {
             Log.d(TAG, "Ignoring request to refresh all feeds: Refresh lock is locked");
             return;
@@ -116,7 +117,7 @@ public final class DBTasks {
             throw new IllegalStateException("DBTasks.refreshAllFeeds() must not be called from the main thread.");
         }
 
-        refreshFeeds(context, DBReader.getFeedList());
+        refreshFeeds(context, DBReader.getFeedList(), initiatedByUser);
         isRefreshing.set(false);
 
         SharedPreferences prefs = context.getSharedPreferences(PREF_NAME, MODE_PRIVATE);
@@ -134,9 +135,11 @@ public final class DBTasks {
     /**
      * @param context
      * @param feedList the list of feeds to refresh
+     * @param initiatedByUser a boolean indicating if the refresh was triggered by user action.
      */
     private static void refreshFeeds(final Context context,
-                                     final List<Feed> feedList) {
+                                     final List<Feed> feedList,
+                                     boolean initiatedByUser) {
 
         for (Feed feed : feedList) {
             FeedPreferences prefs = feed.getPreferences();
@@ -153,7 +156,7 @@ public final class DBTasks {
                                                DownloadError.ERROR_REQUEST_ERROR,
                                                false,
                                                e.getMessage(),
-                                               false)
+                                               initiatedByUser)
                     );
                 }
             }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java b/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java
index e093a7e00..fc04d82cc 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java
@@ -115,7 +115,7 @@ public class AutoUpdateManager {
     public static void runImmediate(@NonNull Context context) {
         Log.d(TAG, "Run auto update immediately in background.");
         new Thread(() -> {
-            DBTasks.refreshAllFeeds(context.getApplicationContext());
+            DBTasks.refreshAllFeeds(context.getApplicationContext(), true);
         }, "ManualRefreshAllFeeds").start();
     }