Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-04 03:43:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reset account/identity/folder error on save

Browse Source
This commit is contained in:
M66B
2018-12-23 08:31:24 +00:00
parent db1443ad33
commit 51fa384ee9
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@@ -728,12 +728,12 @@ public class FragmentAccount extends FragmentEx {
if (!update) if (!update)
account.created = now; account.created = now;
account.error = null;
if (synchronize) if (synchronize)
account.last_connected = now; account.last_connected = now;
if (!synchronize)
account.error = null;
if (account.primary) if (account.primary)
db.account().resetPrimary(); db.account().resetPrimary();

4
app/src/main/java/eu/faircode/email/FragmentFolder.java
View File

@@ -222,12 +222,10 @@ public class FragmentFolder extends FragmentEx {
display, unified, notify, hide, display, unified, notify, hide,
synchronize, poll, download, synchronize, poll, download,
sync_days, keep_days); sync_days, keep_days);
db.folder().setFolderError(id, null);
db.message().deleteMessagesBefore(id, keep_time, true); db.message().deleteMessagesBefore(id, keep_time, true);
if (!synchronize)
db.folder().setFolderError(id, null);
EntityOperation.sync(db, folder.id); EntityOperation.sync(db, folder.id);
} }

4
app/src/main/java/eu/faircode/email/FragmentIdentity.java
View File

@@ -516,9 +516,7 @@ public class FragmentIdentity extends FragmentEx {
identity.primary = (identity.synchronize && primary); identity.primary = (identity.synchronize && primary);
identity.store_sent = false; identity.store_sent = false;
identity.sent_folder = (sent == null ? null : sent.id); identity.sent_folder = (sent == null ? null : sent.id);
identity.error = null;
if (!identity.synchronize)
identity.error = null;
if (identity.primary) if (identity.primary)
db.identity().resetPrimary(); db.identity().resetPrimary();