Changes based on feedback

app/src/main/java/de/danoeh/antennapod/config/DownloadServiceCallbacksImpl.java

@@ -36,7 +36,7 @@ public class DownloadServiceCallbacksImpl implements DownloadServiceCallbacks {
     }
 
     @Override
-    public PendingIntent getReportNotificationContentIntent(Context context, boolean autoDownloadReport) {
+    public PendingIntent getReportNotificationContentIntent(Context context) {
         Intent intent = new Intent(context, MainActivity.class);
         intent.putExtra(MainActivity.EXTRA_FRAGMENT_TAG, DownloadsFragment.TAG);
         Bundle args = new Bundle();
@@ -45,6 +45,14 @@ public class DownloadServiceCallbacksImpl implements DownloadServiceCallbacks {
         return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
+    @Override
+    public PendingIntent getAutoDownloadReportNotificationContentIntent(Context context) {
+        Intent intent = new Intent(context, MainActivity.class);
+        intent.putExtra(MainActivity.EXTRA_NAV_TYPE, NavListAdapter.VIEW_TYPE_NAV);
+        intent.putExtra(MainActivity.EXTRA_FRAGMENT_TAG, QueueFragment.TAG);
+        return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+
     @Override
     public void onFeedParsed(Context context, Feed feed) {
         // do nothing

core/src/main/java/de/danoeh/antennapod/core/DownloadServiceCallbacks.java

@@ -40,7 +40,17 @@ public interface DownloadServiceCallbacks {
      *
      * @return A non-null PendingIntent for the notification or null if shouldCreateReport()==false
      */
-    PendingIntent getReportNotificationContentIntent(Context context, boolean autoDownloadReport);
+    PendingIntent getReportNotificationContentIntent(Context context);
+
+    /**
+     * Returns a PendingIntent for notification that notifies the user about the episodes that have been automatically
+     * downloaded.
+     * <p/>
+     * The PendingIntent takes users to an activity where they can look at their episode queue.
+     *
+     * @return A non-null PendingIntent for the notification or null if shouldCreateReport()==false
+     */
+    PendingIntent getAutoDownloadReportNotificationContentIntent(Context context);
 
     /**
      * Called by the FeedSyncThread after a feed has been downloaded and parsed.

core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java

@@ -2,6 +2,7 @@ package de.danoeh.antennapod.core.service.download;
 
 import android.app.Notification;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.Context;
 import android.os.Build;
 import android.text.TextUtils;
@@ -15,6 +16,7 @@ import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ConcurrentLinkedDeque;
 
 public class DownloadServiceNotification {
     private static final String TAG = "DownloadSvcNotification";
@@ -107,7 +109,7 @@ public class DownloadServiceNotification {
         for (DownloadStatus status : reportQueue) {
             if (status.isSuccessful()) {
                 successfulDownloads++;
-                createReport = createReport || showAutoDownloadReport && !status.isInitiatedByUser() && status.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA;
+                createReport |= showAutoDownloadReport && !status.isInitiatedByUser() && status.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA;
             } else if (!status.isCancelled()) {
                 failedDownloads++;
                 createReport = true;
@@ -118,16 +120,29 @@ public class DownloadServiceNotification {
             Log.d(TAG, "Creating report");
 
             // create notification object
-            boolean autoDownloadReport = failedDownloads == 0;
+            String channelId;
-            String channelId = autoDownloadReport ? NotificationUtils.CHANNEL_ID_AUTO_DOWNLOAD : NotificationUtils.CHANNEL_ID_ERROR;
+            int titleId;
-            int titleId = autoDownloadReport ? R.string.auto_download_report_title : R.string.download_report_title;
+            int iconId;
+            PendingIntent intent;
+            if (failedDownloads == 0) {
+                // We are generating an auto-download report
+                channelId = NotificationUtils.CHANNEL_ID_AUTO_DOWNLOAD;
+                titleId = R.string.auto_download_report_title;
+                iconId = R.drawable.stat_notify_sync;
+                intent = ClientConfig.downloadServiceCallbacks.getAutoDownloadReportNotificationContentIntent(context);
+            } else {
+                channelId = NotificationUtils.CHANNEL_ID_ERROR;
+                titleId = R.string.download_report_title;
+                iconId = R.drawable.stat_notify_sync_error;
+                intent = ClientConfig.downloadServiceCallbacks.getReportNotificationContentIntent(context);
+            }
 
             NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channelId);
             builder.setTicker(context.getString(titleId))
-                   .setContentTitle(context.getString(R.string.download_report_content_title))
+                   .setContentTitle(context.getString(titleId))
                    .setContentText(String.format(context.getString(R.string.download_report_content), successfulDownloads, failedDownloads))
-                   .setSmallIcon(autoDownloadReport ? R.drawable.stat_notify_sync : R.drawable.stat_notify_sync_error)
+                   .setSmallIcon(iconId)
-                   .setContentIntent(ClientConfig.downloadServiceCallbacks.getReportNotificationContentIntent(context, autoDownloadReport))
+                   .setContentIntent(intent)
                    .setAutoCancel(true);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);

core/src/main/java/de/danoeh/antennapod/core/service/download/handler/FeedParserTask.java

@@ -82,7 +82,7 @@ public class FeedParserTask implements Callable<FeedHandlerResult> {
                                                 successful, reasonDetailed, request.isInitiatedByUser());
             return result;
         } else {
-            downloadStatus = new DownloadStatus(feed, feed.getHumanReadableIdentifier(), reason, successful,
+            downloadStatus = new DownloadStatus(feed, feed.getTitle(), reason, successful,
                                                 reasonDetailed, request.isInitiatedByUser());
             return null;
         }

core/src/main/java/de/danoeh/antennapod/core/util/gui/NotificationUtils.java

@@ -67,11 +67,9 @@ public class NotificationUtils {
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private static NotificationChannel createChannelAutoDownload(Context c) {
-        NotificationChannel mChannel = new NotificationChannel(
+        NotificationChannel mChannel = new NotificationChannel(CHANNEL_ID_AUTO_DOWNLOAD,
-                                            CHANNEL_ID_AUTO_DOWNLOAD,
+                c.getString(R.string.notification_channel_auto_download), NotificationManager.IMPORTANCE_DEFAULT);
-                                            c.getString(R.string.notification_channel_auto_download),
+        mChannel.setDescription(c.getString(R.string.notification_channel_episode_auto_download));
-                                            NotificationManager.IMPORTANCE_DEFAULT);
-        mChannel.setDescription(c.getString(R.string.notification_channel_downloading_description));
         return mChannel;
     }
 }

core/src/main/res/values/strings.xml

@@ -237,7 +237,7 @@
     <string name="download_canceled_msg">Download canceled</string>
     <string name="download_canceled_autodownload_enabled_msg">Download canceled\nDisabled <i>Auto Download</i> for this item</string>
     <string name="download_report_title">Downloads completed with error(s)</string>
-    <string name="auto_download_report_title">Downloads completed</string>
+    <string name="auto_download_report_title">Auto-downloads completed</string>
     <string name="download_report_content_title">Download Report</string>
     <string name="download_error_malformed_url">Malformed URL</string>
     <string name="download_error_io_error">IO Error</string>
@@ -472,7 +472,7 @@
     <string name="pref_showDownloadReport_title">Show Download Report</string>
     <string name="pref_showDownloadReport_sum">If downloads fail, generate a report that shows the details of the failure.</string>
     <string name="pref_showAutoDownloadReport_title">Show Auto Download Report</string>
-    <string name="pref_showAutoDownloadReport_sum">Generate a report that shows the details of auto downloaded episodes.</string>
+    <string name="pref_showAutoDownloadReport_sum">Show a notification for automatically downloaded episodes.</string>
     <string name="pref_expand_notify_unsupport_toast">Android versions before 4.1 do not support expanded notifications.</string>
     <string name="pref_enqueue_location_title">Enqueue Location</string>
     <string name="pref_enqueue_location_sum">Add episodes to: %1$s</string>
@@ -785,7 +785,7 @@
     <string name="notification_channel_error">Errors</string>
     <string name="notification_channel_error_description">Shown if something went wrong, for example if download or gpodder sync fails.</string>
     <string name="notification_channel_auto_download">Auto Downloads</string>
-    <string name="notification_channel_error_auto_download">Shown when episodes have been automatically downloaded.</string>
+    <string name="notification_channel_episode_auto_download">Shown when episodes have been automatically downloaded.</string>
 
     <!-- Widget settings -->
     <string name="widget_settings">Widget settings</string>