From 0ed815fff70fbcbef6963f41089324af601dc56e Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 24 Jun 2019 08:45:55 +0200 Subject: [PATCH] Alert improvements --- app/src/main/java/eu/faircode/email/FragmentAccount.java | 1 + app/src/main/java/eu/faircode/email/Helper.java | 3 +++ app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index 44f0072a5f..cbba187ea3 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -1028,6 +1028,7 @@ public class FragmentAccount extends FragmentBase { if (!synchronize) { NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); nm.cancel("receive:" + account.id, 1); + nm.cancel("alert:" + account.id, 1); } return false; diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 8940f1ea04..719c8ec0f8 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -401,6 +401,9 @@ public class Helper { "This operation is not allowed on a closed folder".equals(ex.getMessage()))) return null; + if (ex instanceof Core.AlertException) + return ex.getMessage(); + StringBuilder sb = new StringBuilder(); if (BuildConfig.DEBUG) sb.append(ex.toString()); diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 4c5ecc7cc3..ade1abd733 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -601,7 +601,7 @@ public class ServiceSynchronize extends LifecycleService { if (message != null && !message.startsWith("Too many simultaneous connections")) { NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - nm.notify("receive:" + account.id, 1, + nm.notify("alert:" + account.id, 1, Core.getNotificationError( ServiceSynchronize.this, "warning", account.name, new Core.AlertException(message))