From 4353ab9020b7727ab50ef53d2aaa7cb8c95aff3c Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 5 Mar 2021 17:43:05 +0100 Subject: [PATCH] Cancel pending sync on poll --- .../eu/faircode/email/ServiceSynchronize.java | 5 ++++- .../res/drawable/{settings.xml => dropdown.xml} | 0 .../res/drawable/twotone_settings_suggest_24.xml | 15 --------------- 3 files changed, 4 insertions(+), 16 deletions(-) rename app/src/main/res/drawable/{settings.xml => dropdown.xml} (100%) delete mode 100644 app/src/main/res/drawable/twotone_settings_suggest_24.xml diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index e47e613050..da197403e5 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -1658,8 +1658,11 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences if (!mapFolders.get(folder).isOpen()) throw new StoreClosedException(iservice.getStore(), "NOOP " + folder.name); } else { - if (folder.poll_count == 0) + if (folder.poll_count == 0) { + // Cancel pending sync, for example when the folder is not set to poll + db.operation().deleteOperation(folder.id, EntityOperation.SYNC); EntityOperation.sync(this, folder.id, false); + } folder.poll_count = (folder.poll_count + 1) % folder.poll_factor; db.folder().setFolderPollCount(folder.id, folder.poll_count); Log.i(folder.name + " poll count=" + folder.poll_count); diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/dropdown.xml similarity index 100% rename from app/src/main/res/drawable/settings.xml rename to app/src/main/res/drawable/dropdown.xml diff --git a/app/src/main/res/drawable/twotone_settings_suggest_24.xml b/app/src/main/res/drawable/twotone_settings_suggest_24.xml deleted file mode 100644 index ecdb7f6011..0000000000 --- a/app/src/main/res/drawable/twotone_settings_suggest_24.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - -