From e49e1d702facc175c74fdfdbbb33b552c63adf47 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 1 May 2021 15:26:02 +0200 Subject: [PATCH] Small improvements --- app/src/main/java/eu/faircode/email/Core.java | 4 +++- .../main/java/eu/faircode/email/ServiceExternal.java | 2 +- .../java/eu/faircode/email/ServiceSynchronize.java | 12 ++++++------ 3 files changed, 10 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 46eb023f56..384ae9de04 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -2722,9 +2722,11 @@ class Core { uids.remove(ifolder.getUID(imessages[i])); } catch (MessageRemovedException ex) { Log.w(folder.name, ex); + } catch (FolderClosedException ex) { + throw ex; } catch (Throwable ex) { Log.e(folder.name, ex); - EntityLog.log(context, folder.name + " " + Log.formatThrowable(ex, false)); + EntityLog.log(context, folder.name + " expunge " + Log.formatThrowable(ex, false)); db.folder().setFolderError(folder.id, Log.formatThrowable(ex)); } diff --git a/app/src/main/java/eu/faircode/email/ServiceExternal.java b/app/src/main/java/eu/faircode/email/ServiceExternal.java index 44e5b59af9..f974873ebb 100644 --- a/app/src/main/java/eu/faircode/email/ServiceExternal.java +++ b/app/src/main/java/eu/faircode/email/ServiceExternal.java @@ -109,7 +109,7 @@ public class ServiceExternal extends Service { } } catch (Throwable ex) { Log.e(ex); - EntityLog.log(context, Log.formatThrowable(ex)); + EntityLog.log(context, "External " + Log.formatThrowable(ex)); } } }); diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 09432f95ad..29119675e9 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -1428,7 +1428,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences Log.e(folder.name, ex); EntityLog.log( ServiceSynchronize.this, - folder.name + " " + Log.formatThrowable(ex, false)); + folder.name + " added " + Log.formatThrowable(ex, false)); state.error(ex); } finally { wlMessage.release(); @@ -1459,7 +1459,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences Log.e(folder.name, ex); EntityLog.log( ServiceSynchronize.this, - folder.name + " " + Log.formatThrowable(ex, false)); + folder.name + " removed " + Log.formatThrowable(ex, false)); state.error(ex); } finally { wlMessage.release(); @@ -1485,7 +1485,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences Log.e(folder.name, ex); EntityLog.log( ServiceSynchronize.this, - folder.name + " " + Log.formatThrowable(ex, false)); + folder.name + " changed " + Log.formatThrowable(ex, false)); state.error(ex); } finally { wlMessage.release(); @@ -1508,7 +1508,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences Log.e(folder.name, ex); EntityLog.log( ServiceSynchronize.this, - folder.name + " " + Log.formatThrowable(ex, false)); + folder.name + " idle " + Log.formatThrowable(ex, false)); state.error(new FolderClosedException(ifolder, "IDLE", new Exception(ex))); } finally { Log.i(folder.name + " end idle"); @@ -1752,7 +1752,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences Log.e(folder.name, ex); EntityLog.log( ServiceSynchronize.this, - folder.name + " " + Log.formatThrowable(ex, false)); + folder.name + " process " + Log.formatThrowable(ex, false)); db.folder().setFolderError(folder.id, Log.formatThrowable(ex)); if (!(ex instanceof FolderNotFoundException)) state.error(new OperationCanceledException("Process")); @@ -1923,7 +1923,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences last_fail = ex; Log.e(account.name, ex); EntityLog.log(this, - account.name + " " + Log.formatThrowable(ex, false)); + account.name + " connect " + Log.formatThrowable(ex, false)); db.account().setAccountError(account.id, Log.formatThrowable(ex)); // Report account connection error