From ced15f290a15340f2d466981bc19deebe65cd30c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 30 Oct 2020 15:42:44 +0100
Subject: [PATCH] Small improvements

---
 app/src/main/java/eu/faircode/email/Core.java      |  2 +-
 .../java/eu/faircode/email/ServiceSynchronize.java | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 91ae00cc89..8fcb57aa15 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1315,7 +1315,7 @@ class Core {
                         ifolder.open(Folder.READ_WRITE);
                     } catch (Throwable ex) {
                         Log.e(ex);
-                        state.error(new FolderClosedException(ifolder, "POP"));
+                        state.error(new FolderClosedException(ifolder, "POP", new Exception(ex)));
                     }
                 }
             }
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 68b4e3b3a9..e709ef21fc 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1254,7 +1254,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                         EntityLog.log(
                                                 ServiceSynchronize.this,
                                                 folder.name + " " + Log.formatThrowable(ex, false));
-                                        state.error(new FolderClosedException(ifolder, "IDLE"));
+                                        state.error(new FolderClosedException(ifolder, "IDLE", new Exception(ex)));
                                     } finally {
                                         Log.i(folder.name + " end idle");
                                     }
@@ -1469,13 +1469,11 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                     " Tune interval=" + account.poll_interval +
                                     " idle=" + idleTime + "/" + tune);
                         try {
-                            if (!state.isRecoverable()) {
-                                Throwable ex = state.getUnrecoverable();
-                                if (ex instanceof Exception)
-                                    throw new StoreClosedException(iservice.getStore(), "Unrecoverable", (Exception) ex);
-                                else
-                                    throw new StoreClosedException(iservice.getStore(), "Unrecoverable");
-                            }
+                            if (!state.isRecoverable())
+                                throw new StoreClosedException(
+                                        iservice.getStore(),
+                                        "Unrecoverable",
+                                        new Exception(state.getUnrecoverable()));
 
                             // Sends store NOOP
                             EntityLog.log(ServiceSynchronize.this, account.name + " checking store");