From f2779c7f0fdc949c4442719dd3e46d5c862c39a1 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 14 Aug 2018 14:50:41 +0000
Subject: [PATCH] Fixed handling send problems

---
 .../eu/faircode/email/AdapterMessage.java     |  2 +-
 .../eu/faircode/email/ServiceSynchronize.java | 22 ++++++-------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 24fa391622..f73e8198af 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -135,7 +135,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                                 "\n" + message.msgid;
                         if (operations != null)
                             for (EntityOperation op : operations)
-                                text += "\n" + op.name + " " + df.format(new Date(op.created));
+                                text += "\n" + op.id + ":" + op.name + " " + df.format(new Date(op.created));
 
                         tvError.setText(text);
                         tvError.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 5df68ec52d..f06d33e585 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -50,7 +50,6 @@ import com.sun.mail.imap.IMAPFolder;
 import com.sun.mail.imap.IMAPMessage;
 import com.sun.mail.imap.IMAPStore;
 import com.sun.mail.imap.protocol.IMAPProtocol;
-import com.sun.mail.smtp.SMTPSendFailedException;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -83,6 +82,7 @@ import javax.mail.FolderNotFoundException;
 import javax.mail.Message;
 import javax.mail.MessageRemovedException;
 import javax.mail.MessagingException;
+import javax.mail.SendFailedException;
 import javax.mail.Session;
 import javax.mail.Transport;
 import javax.mail.UIDFolder;
@@ -318,11 +318,8 @@ public class ServiceSynchronize extends LifecycleService {
 
     private void reportError(String account, String folder, Throwable ex) {
         String action = account + "/" + folder;
-        if (!(ex instanceof IllegalStateException) && // This operation is not allowed on a closed folder
-                !(ex instanceof FolderClosedException)) {
-            NotificationManager nm = getSystemService(NotificationManager.class);
-            nm.notify(action, 1, getNotificationError(action, ex).build());
-        }
+        NotificationManager nm = getSystemService(NotificationManager.class);
+        nm.notify(action, 1, getNotificationError(action, ex).build());
     }
 
     private void monitorAccount(final EntityAccount account, final ServiceState state) {
@@ -852,20 +849,15 @@ public class ServiceSynchronize extends LifecycleService {
                             db.operation().deleteOperation(op.id);
                         } catch (Throwable ex) {
                             // TODO: SMTP response codes: https://www.ietf.org/rfc/rfc821.txt
-                            if (ex instanceof SMTPSendFailedException)
+                            if (ex instanceof SendFailedException)
                                 reportError(null, folder.name, ex);
 
                             db.message().setMessageError(message.id, Helper.formatThrowable(ex));
 
-                            if (BuildConfig.DEBUG && ex instanceof NullPointerException) {
-                                db.operation().deleteOperation(op.id);
-                                throw ex;
-                            }
-
                             if (ex instanceof MessageRemovedException ||
                                     ex instanceof FolderNotFoundException ||
-                                    ex instanceof SMTPSendFailedException) {
-                                Log.w(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
+                                    ex instanceof SendFailedException) {
+                                Log.w(Helper.TAG, "Unrecoverable " + ex + "\n" + Log.getStackTraceString(ex));
 
                                 // There is no use in repeating
                                 db.operation().deleteOperation(op.id);
@@ -873,7 +865,7 @@ public class ServiceSynchronize extends LifecycleService {
                             } else if (ex instanceof MessagingException) {
                                 // Socket timeout is a recoverable condition (send message)
                                 if (ex.getCause() instanceof SocketTimeoutException) {
-                                    Log.w(Helper.TAG, "Recoverable " + ex);
+                                    Log.w(Helper.TAG, "Recoverable " + ex + "\n" + Log.getStackTraceString(ex));
                                     // No need to inform user
                                     return;
                                 }