Added logging, refactor reforce sync

app/src/main/java/eu/faircode/email/EntityFolder.java

@@ -324,6 +324,11 @@ public class EntityFolder extends EntityOrder implements Serializable {
         return jargs;
     }
 
+    static boolean isSyncForced(String args) throws JSONException {
+        JSONArray jargs = new JSONArray(args);
+        return jargs.optBoolean(5, false);
+    }
+
     static int getIcon(String type) {
         if (EntityFolder.INBOX.equals(type))
             return R.drawable.twotone_inbox_24;

app/src/main/java/eu/faircode/email/ServiceSynchronize.java

@@ -1907,19 +1907,23 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                         } else {
                                             if (folder.poll_count == 0) {
                                                 // Cancel pending sync, for example when the folder is not set to poll
+                                                boolean fforce = false;
                                                 List<EntityOperation> ops = db.operation().getOperations(folder.account, EntityOperation.SYNC);
-                                                if (ops.size() == 0)
+                                                for (EntityOperation op : ops)
-                                                    EntityOperation.sync(this, folder.id, false);
+                                                    if (EntityFolder.isSyncForced(op.args)) {
-                                                else
+                                                        fforce = true;
-                                                    for (EntityOperation op : ops) {
+                                                        break;
-                                                        db.operation().deleteOperation(op.id);
-                                                        op.id = null;
-                                                        op.id = db.operation().insertOperation(op);
                                                     }
+                                                db.operation().deleteOperation(folder.id, EntityOperation.SYNC);
+
+                                                EntityLog.log(this, folder.name + " queue sync poll");
+                                                EntityOperation.sync(this, folder.id, false, fforce);
                                             }
                                             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);
+                                            EntityLog.log(this, folder.name +
+                                                    " poll count=" + folder.poll_count +
+                                                    " factor=" + folder.poll_factor);
                                         }
                             }
                         } catch (Throwable ex) {