From b4742a20721900c8c8cb9f16d7737c80a436d5eb Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 28 Feb 2019 09:39:04 +0000
Subject: [PATCH] Revert "Sync folders on manual sync"

This reverts commit 03cd7f927eced4527a55fa968a8dc84f994c2be4.
---
 app/src/main/java/eu/faircode/email/AdapterFolder.java   | 2 +-
 app/src/main/java/eu/faircode/email/Core.java            | 2 --
 app/src/main/java/eu/faircode/email/EntityOperation.java | 9 +--------
 .../main/java/eu/faircode/email/FragmentMessages.java    | 2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index b4d03f9307..8bb016bdf1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -320,7 +320,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                                             throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
                                     } else {
                                         now = "connected".equals(account.state);
-                                        EntityOperation.sync(context, db, fid, true);
+                                        EntityOperation.sync(context, db, fid);
                                     }
                                 }
 
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 935cc61b26..40976f0dff 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -185,8 +185,6 @@ class Core {
                                 break;
 
                             case EntityOperation.SYNC:
-                                if (jargs.getBoolean(3))
-                                    onSynchronizeFolders(context, account, istore, state);
                                 onSynchronizeMessages(context, jargs, account, folder, (IMAPFolder) ifolder, state);
                                 break;
 
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index b4853449c3..cf313d2c50 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -99,22 +99,15 @@ public class EntityOperation {
     }
 
     static void sync(Context context, DB db, long fid) {
-        sync(context, db, fid, false);
-    }
-
-    static void sync(Context context, DB db, long fid, boolean folders) {
         if (db.operation().getOperationCount(fid, EntityOperation.SYNC) == 0) {
 
             EntityFolder folder = db.folder().getFolder(fid);
 
-            JSONArray jargs = folder.getSyncArgs();
-            jargs.put(folders);
-
             EntityOperation operation = new EntityOperation();
             operation.folder = folder.id;
             operation.message = null;
             operation.name = SYNC;
-            operation.args = jargs.toString();
+            operation.args = folder.getSyncArgs().toString();
             operation.created = new Date().getTime();
             operation.id = db.operation().insertOperation(operation);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 9be72ef424..f365a2a5bc 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -531,7 +531,7 @@ public class FragmentMessages extends FragmentBase {
                                     nointernet = true;
                             } else {
                                 now = "connected".equals(account.state);
-                                EntityOperation.sync(context, db, folder.id, true);
+                                EntityOperation.sync(context, db, folder.id);
                             }
                         }