Make notification channels consistent between app settings and system settings

3 files changed, 49 insertions, 30 deletions

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 975bc3cb3..2d482c689 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
@@ -148,7 +148,7 @@ public class DownloadServiceNotification {
                 id = R.id.notification_auto_download_report;
                 content = createAutoDownloadNotificationContent(reportQueue);
             } else {
-                channelId = NotificationUtils.CHANNEL_ID_ERROR;
+                channelId = NotificationUtils.CHANNEL_ID_DOWNLOAD_ERROR;
                 titleId = R.string.download_report_title;
                 iconId = R.drawable.ic_notification_sync_error;
                 intent = ClientConfig.downloadServiceCallbacks.getReportNotificationContentIntent(context);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/gui/NotificationUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/gui/NotificationUtils.java
index ddbe68938..47975b013 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/gui/NotificationUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/gui/NotificationUtils.java
@@ -2,6 +2,7 @@ package de.danoeh.antennapod.core.util.gui;
 
 
 import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Build;
@@ -13,10 +14,13 @@ public class NotificationUtils {
     public static final String CHANNEL_ID_USER_ACTION = "user_action";
     public static final String CHANNEL_ID_DOWNLOADING = "downloading";
     public static final String CHANNEL_ID_PLAYING = "playing";
-    public static final String CHANNEL_ID_ERROR = "error";
+    public static final String CHANNEL_ID_DOWNLOAD_ERROR = "error";
     public static final String CHANNEL_ID_SYNC_ERROR = "sync_error";
     public static final String CHANNEL_ID_AUTO_DOWNLOAD = "auto_download";
 
+    public static final String GROUP_ID_ERRORS = "group_errors";
+    public static final String GROUP_ID_NEWS = "group_news";
+
     public static void createChannels(Context context) {
         if (android.os.Build.VERSION.SDK_INT < 26) {
             return;
@@ -24,6 +28,9 @@ public class NotificationUtils {
         NotificationManager mNotificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
         if (mNotificationManager != null) {
+            mNotificationManager.createNotificationChannelGroup(createGroupErrors(context));
+            mNotificationManager.createNotificationChannelGroup(createGroupNews(context));
+
             mNotificationManager.createNotificationChannel(createChannelUserAction(context));
             mNotificationManager.createNotificationChannel(createChannelDownloading(context));
             mNotificationManager.createNotificationChannel(createChannelPlaying(context));
@@ -35,36 +42,38 @@ public class NotificationUtils {
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private static NotificationChannel createChannelUserAction(Context c) {
-        NotificationChannel mChannel = new NotificationChannel(CHANNEL_ID_USER_ACTION,
+        NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID_USER_ACTION,
                 c.getString(R.string.notification_channel_user_action), NotificationManager.IMPORTANCE_HIGH);
-        mChannel.setDescription(c.getString(R.string.notification_channel_user_action_description));
-        return mChannel;
+        notificationChannel.setDescription(c.getString(R.string.notification_channel_user_action_description));
+        notificationChannel.setGroup(GROUP_ID_ERRORS);
+        return notificationChannel;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private static NotificationChannel createChannelDownloading(Context c) {
-        NotificationChannel mChannel = new NotificationChannel(CHANNEL_ID_DOWNLOADING,
+        NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID_DOWNLOADING,
                 c.getString(R.string.notification_channel_downloading), NotificationManager.IMPORTANCE_LOW);
-        mChannel.setDescription(c.getString(R.string.notification_channel_downloading_description));
-        mChannel.setShowBadge(false);
-        return mChannel;
+        notificationChannel.setDescription(c.getString(R.string.notification_channel_downloading_description));
+        notificationChannel.setShowBadge(false);
+        return notificationChannel;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private static NotificationChannel createChannelPlaying(Context c) {
-        NotificationChannel mChannel = new NotificationChannel(CHANNEL_ID_PLAYING,
+        NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID_PLAYING,
                 c.getString(R.string.notification_channel_playing), NotificationManager.IMPORTANCE_LOW);
-        mChannel.setDescription(c.getString(R.string.notification_channel_playing_description));
-        mChannel.setShowBadge(false);
-        return mChannel;
+        notificationChannel.setDescription(c.getString(R.string.notification_channel_playing_description));
+        notificationChannel.setShowBadge(false);
+        return notificationChannel;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private static NotificationChannel createChannelError(Context c) {
-        NotificationChannel mChannel = new NotificationChannel(CHANNEL_ID_ERROR,
-                c.getString(R.string.notification_channel_error), NotificationManager.IMPORTANCE_HIGH);
-        mChannel.setDescription(c.getString(R.string.notification_channel_error_description));
-        return mChannel;
+        NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID_DOWNLOAD_ERROR,
+                c.getString(R.string.notification_channel_download_error), NotificationManager.IMPORTANCE_HIGH);
+        notificationChannel.setDescription(c.getString(R.string.notification_channel_download_error_description));
+        notificationChannel.setGroup(GROUP_ID_ERRORS);
+        return notificationChannel;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
@@ -72,14 +81,28 @@ public class NotificationUtils {
         NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID_SYNC_ERROR,
                 c.getString(R.string.notification_channel_sync_error), NotificationManager.IMPORTANCE_HIGH);
         notificationChannel.setDescription(c.getString(R.string.notification_channel_sync_error_description));
+        notificationChannel.setGroup(GROUP_ID_ERRORS);
         return notificationChannel;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private static NotificationChannel createChannelAutoDownload(Context c) {
-        NotificationChannel mChannel = new NotificationChannel(CHANNEL_ID_AUTO_DOWNLOAD,
+        NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID_AUTO_DOWNLOAD,
                 c.getString(R.string.notification_channel_auto_download), NotificationManager.IMPORTANCE_DEFAULT);
-        mChannel.setDescription(c.getString(R.string.notification_channel_episode_auto_download));
-        return mChannel;
+        notificationChannel.setDescription(c.getString(R.string.notification_channel_episode_auto_download));
+        notificationChannel.setGroup(GROUP_ID_NEWS);
+        return notificationChannel;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private static NotificationChannelGroup createGroupErrors(Context c) {
+        return new NotificationChannelGroup(GROUP_ID_ERRORS,
+                c.getString(R.string.notification_group_errors));
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private static NotificationChannelGroup createGroupNews(Context c) {
+        return new NotificationChannelGroup(GROUP_ID_NEWS,
+                c.getString(R.string.notification_group_news));
     }
 }
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index d760052d4..9f536c037 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -450,8 +450,6 @@
     <string name="pref_gpodnet_full_sync_title">Force full synchronization</string>
     <string name="pref_gpodnet_full_sync_sum">Sync all subscriptions and episode states with gpodder.net.</string>
     <string name="pref_gpodnet_login_status"><![CDATA[Logged in as <i>%1$s</i> with device <i>%2$s</i>]]></string>
-    <string name="pref_gpodnet_notifications_title">Synchronization failed</string>
-    <string name="pref_gpodnet_notifications_sum">This setting does not apply to authentication errors.</string>
     <string name="pref_playback_speed_sum">Customize the speeds available for variable speed playback</string>
     <string name="pref_feed_playback_speed_sum">The speed to use when starting audio playback for episodes in this podcast</string>
     <string name="pref_feed_skip">Auto Skip</string>
@@ -478,10 +476,6 @@
     <string name="pref_compact_notification_buttons_dialog_error">You can only select a maximum of %1$d items.</string>
     <string name="pref_lockscreen_background_title">Set Lockscreen Background</string>
     <string name="pref_lockscreen_background_sum">Set the lockscreen background to the current episode\'s image. As a side effect, this will also show the image in third party apps.</string>
-    <string name="pref_showDownloadReport_title">Download failed</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">Automatic download completed</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>
@@ -854,17 +848,19 @@
     <string name="cast_failed_media_error_skipping">Error playing media. Skipping&#8230;</string>
 
     <!-- Notification channels -->
+    <string name="notification_group_errors">Errors</string>
+    <string name="notification_group_news">News</string>
     <string name="notification_channel_user_action">Action required</string>
     <string name="notification_channel_user_action_description">Shown if your action is required, for example if you need to enter a password.</string>
     <string name="notification_channel_downloading">Downloading</string>
     <string name="notification_channel_downloading_description">Shown while currently downloading.</string>
     <string name="notification_channel_playing">Currently playing</string>
     <string name="notification_channel_playing_description">Allows to control playback. This is the main notification you see while playing a podcast.</string>
-    <string name="notification_channel_error">Errors</string>
-    <string name="notification_channel_error_description">Shown if something went wrong, for example if download or feed update fails.</string>
-    <string name="notification_channel_sync_error">Synchronization Errors</string>
+    <string name="notification_channel_download_error">Download failed</string>
+    <string name="notification_channel_download_error_description">Shown when download or feed update fails.</string>
+    <string name="notification_channel_sync_error">Synchronization failed</string>
     <string name="notification_channel_sync_error_description">Shown when gpodder synchronization fails.</string>
-    <string name="notification_channel_auto_download">Auto Downloads</string>
+    <string name="notification_channel_auto_download">Automatic download completed</string>
     <string name="notification_channel_episode_auto_download">Shown when episodes have been automatically downloaded.</string>
 
     <!-- Widget settings -->