From d7bb43f1674cbfdc36ca7088b8f6a317c20406c0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 19 Nov 2018 18:10:55 +0100
Subject: [PATCH] Auto cancel error notifications

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java  | 8 ++++++--
 app/src/main/java/eu/faircode/email/FragmentAccount.java | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index c059b9a578..d19d0683e1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -20,6 +20,7 @@ package eu.faircode.email;
 */
 
 import android.Manifest;
+import android.app.NotificationManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -1244,9 +1245,12 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                                             db.beginTransaction();
 
                                             EntityMessage message = db.message().getMessage(id);
-                                            if (message.uid == null && !TextUtils.isEmpty(message.error)) // outbox
+                                            if (message.uid == null && !TextUtils.isEmpty(message.error)) {
+                                                // outbox
                                                 db.message().deleteMessage(id);
-                                            else {
+                                                NotificationManager nm = context.getSystemService(NotificationManager.class);
+                                                nm.cancel("send", message.account.intValue());
+                                            } else {
                                                 db.message().setMessageUiHide(message.id, true);
                                                 EntityOperation.queue(db, message, EntityOperation.DELETE);
                                             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 159ac2c87d..ad2b0c8a8d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -25,6 +25,7 @@ import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;
 import android.app.Activity;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -778,6 +779,11 @@ public class FragmentAccount extends FragmentEx {
                         if (reload)
                             ServiceSynchronize.reload(getContext(), "save account");
 
+                        if (!synchronize) {
+                            NotificationManager nm = getContext().getSystemService(NotificationManager.class);
+                            nm.cancel("receive", account.id.intValue());
+                        }
+
                         return null;
                     }