From df00a0d0416e6181c4d20038ec5b41b6caa85c54 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 14 Jun 2021 14:57:44 +0200
Subject: [PATCH] Revert "Set bypass DND for high priority notifications"

This reverts commit b7366afaf9382448d11885717906c407d8e3e74d.
---
 app/src/main/java/eu/faircode/email/AdapterMessage.java     | 1 -
 app/src/main/java/eu/faircode/email/EntityAccount.java      | 1 -
 app/src/main/java/eu/faircode/email/NotificationHelper.java | 5 -----
 app/src/main/java/eu/faircode/email/TupleFolderEx.java      | 1 -
 4 files changed, 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d5b42df5ba..cfd751787a 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3640,7 +3640,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     channel.setGroup("contacts");
                     channel.setDescription(from.getPersonal());
                     channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-                    channel.setBypassDnd(true);
                     channel.enableLights(true);
                     nm.createNotificationChannel(channel);
                     onActionEditChannel();
diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 53fe6df2f3..39d206487b 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -190,7 +190,6 @@ public class EntityAccount extends EntityOrder implements Serializable {
                 NotificationManager.IMPORTANCE_HIGH);
         channel.setGroup(group.getId());
         channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-        channel.setBypassDnd(true);
         channel.enableLights(true);
         nm.createNotificationChannel(channel);
     }
diff --git a/app/src/main/java/eu/faircode/email/NotificationHelper.java b/app/src/main/java/eu/faircode/email/NotificationHelper.java
index 2620371118..10761d5990 100644
--- a/app/src/main/java/eu/faircode/email/NotificationHelper.java
+++ b/app/src/main/java/eu/faircode/email/NotificationHelper.java
@@ -74,7 +74,6 @@ class NotificationHelper {
         notification.enableLights(true);
         notification.setLightColor(Color.YELLOW);
         notification.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-        notification.setBypassDnd(true);
         nm.createNotificationChannel(notification);
 
         NotificationChannel progress = new NotificationChannel(
@@ -92,7 +91,6 @@ class NotificationHelper {
                     NotificationManager.IMPORTANCE_HIGH);
             update.setSound(null, Notification.AUDIO_ATTRIBUTES_DEFAULT);
             update.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-            update.setBypassDnd(true);
             nm.createNotificationChannel(update);
         }
 
@@ -101,7 +99,6 @@ class NotificationHelper {
                 "warning", context.getString(R.string.channel_warning),
                 NotificationManager.IMPORTANCE_HIGH);
         warning.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-        warning.setBypassDnd(true);
         nm.createNotificationChannel(warning);
 
         // Errors
@@ -110,7 +107,6 @@ class NotificationHelper {
                 context.getString(R.string.channel_error),
                 NotificationManager.IMPORTANCE_HIGH);
         error.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-        error.setBypassDnd(true);
         nm.createNotificationChannel(error);
 
         // Server alerts
@@ -119,7 +115,6 @@ class NotificationHelper {
                 context.getString(R.string.channel_alert),
                 NotificationManager.IMPORTANCE_HIGH);
         alerts.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-        alerts.setBypassDnd(true);
         nm.createNotificationChannel(alerts);
 
         // Contacts grouping
diff --git a/app/src/main/java/eu/faircode/email/TupleFolderEx.java b/app/src/main/java/eu/faircode/email/TupleFolderEx.java
index 320012a49a..77bf82ee10 100644
--- a/app/src/main/java/eu/faircode/email/TupleFolderEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderEx.java
@@ -92,7 +92,6 @@ public class TupleFolderEx extends EntityFolder implements Serializable {
                 NotificationManager.IMPORTANCE_HIGH);
         channel.setGroup(group.getId());
         channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-        channel.setBypassDnd(true);
         channel.enableLights(true);
         nm.createNotificationChannel(channel);
     }