From 913f85c467b8f82d288026bc51ac8766b28839b9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 17 Mar 2019 18:06:51 +0000
Subject: [PATCH] Added contacts notification group

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 1 +
 app/src/main/java/eu/faircode/email/ApplicationEx.java  | 8 ++++++++
 app/src/main/res/values/strings.xml                     | 1 +
 3 files changed, 10 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 00598d3cd2..2b030b7892 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1235,6 +1235,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             NotificationChannel channel = new NotificationChannel(
                     channelName, from.getAddress(),
                     NotificationManager.IMPORTANCE_HIGH);
+            channel.setGroup("contacts");
             channel.setDescription(from.getPersonal());
             channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
             nm.createNotificationChannel(channel);
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index a86e5173b7..637a9bb730 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -22,6 +22,7 @@ package eu.faircode.email;
 import android.app.Application;
 import android.app.Notification;
 import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.media.Ringtone;
@@ -117,6 +118,11 @@ public class ApplicationEx extends Application {
                     NotificationManager.IMPORTANCE_HIGH);
             error.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
             nm.createNotificationChannel(error);
+
+            NotificationChannelGroup group = new NotificationChannelGroup(
+                    "contacts",
+                    getString(R.string.channel_group_contacts));
+            nm.createNotificationChannelGroup(group);
         }
     }
 
@@ -171,6 +177,8 @@ public class ApplicationEx extends Application {
 
                 if (jchannel.has("group") && !jchannel.isNull("group"))
                     channel.setGroup(jchannel.getString("group"));
+                else
+                    channel.setGroup("contacts");
 
                 if (jchannel.has("description") && !jchannel.isNull("description"))
                     channel.setDescription(jchannel.getString("description"));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 651d2f91c5..648b4221c5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,7 @@
     <string name="channel_notification">Notifications</string>
     <string name="channel_warning">Warnings</string>
     <string name="channel_error">Errors</string>
+    <string name="channel_group_contacts">Contacts</string>
 
     <string name="tile_synchronize">Synchronize</string>
     <string name="tile_unseen">New messages</string>