From 51fa384ee909bb3323b520c0196bebac84927dc1 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 23 Dec 2018 08:31:24 +0000 Subject: [PATCH] Reset account/identity/folder error on save --- app/src/main/java/eu/faircode/email/FragmentAccount.java | 6 +++--- app/src/main/java/eu/faircode/email/FragmentFolder.java | 4 +--- app/src/main/java/eu/faircode/email/FragmentIdentity.java | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index 9253c63186..e65e1b6e8e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -728,12 +728,12 @@ public class FragmentAccount extends FragmentEx { if (!update) account.created = now; + + account.error = null; + if (synchronize) account.last_connected = now; - if (!synchronize) - account.error = null; - if (account.primary) db.account().resetPrimary(); diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java index 155040ea53..a2eb3353f5 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolder.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java @@ -222,12 +222,10 @@ public class FragmentFolder extends FragmentEx { display, unified, notify, hide, synchronize, poll, download, sync_days, keep_days); + db.folder().setFolderError(id, null); db.message().deleteMessagesBefore(id, keep_time, true); - if (!synchronize) - db.folder().setFolderError(id, null); - EntityOperation.sync(db, folder.id); } diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 52101d589f..a91188c1c5 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -516,9 +516,7 @@ public class FragmentIdentity extends FragmentEx { identity.primary = (identity.synchronize && primary); identity.store_sent = false; identity.sent_folder = (sent == null ? null : sent.id); - - if (!identity.synchronize) - identity.error = null; + identity.error = null; if (identity.primary) db.identity().resetPrimary();