From 9c0c37f0e18bf7b4e89a1485a7c3cd4d4f562a93 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 5 Mar 2019 13:09:08 +0000 Subject: [PATCH] Simplification --- app/src/main/java/eu/faircode/email/Core.java | 8 ++------ app/src/main/java/eu/faircode/email/Helper.java | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index fdd11d4119..aede3bd0fb 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -216,12 +216,8 @@ class Core { reportError(context, account, folder, ex); db.operation().setOperationError(op.id, Helper.formatThrowable(ex)); - - if (message != null && - !(ex instanceof MessageRemovedException) && - !(ex instanceof FolderClosedException) && - !(ex instanceof IllegalStateException)) - db.message().setMessageError(message.id, Helper.formatThrowable(ex)); + if (message != null) + db.message().setMessageError(message.id, Helper.formatThrowable(ex, true)); if (ex instanceof MessageRemovedException || ex instanceof FolderNotFoundException || diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 7862259e61..2dd2c143c7 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -307,8 +307,8 @@ public class Helper { if (ex instanceof IllegalStateException) // sync when store disconnected return null; - if (ex instanceof SSLException || ex.getCause() instanceof SSLException) - return null; + //if (ex instanceof SSLException || ex.getCause() instanceof SSLException) + // return null; if (ex instanceof MailConnectException && ex.getCause() instanceof UnknownHostException) return null; }