From 60295ea265445df0fca0530d0b22a2338676ea66 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 2 Mar 2019 07:46:53 +0000
Subject: [PATCH] Refactoring

---
 .../eu/faircode/email/EntityOperation.java    | 67 +++++++++----------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 47f6021e9c..45ee2b792d 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -84,42 +84,7 @@ public class EntityOperation {
         JSONArray jargs = new JSONArray();
         for (Object value : values)
             jargs.put(value);
-        queue(context, db, message, name, jargs);
-    }
-
-    static void sync(Context context, long fid, boolean foreground) {
-        DB db = DB.getInstance(context);
-        if (db.operation().getOperationCount(fid, EntityOperation.SYNC) == 0) {
-
-            EntityFolder folder = db.folder().getFolder(fid);
-            EntityAccount account = null;
-            if (folder.account != null)
-                account = db.account().getAccount(folder.account);
-
-            EntityOperation operation = new EntityOperation();
-            operation.folder = folder.id;
-            operation.message = null;
-            operation.name = SYNC;
-            operation.args = folder.getSyncArgs().toString();
-            operation.created = new Date().getTime();
-            operation.id = db.operation().insertOperation(operation);
-
-            if (account != null && !"connected".equals(account.state)) {
-                db.folder().setFolderState(fid, "waiting");
-                db.folder().setFolderSyncState(fid, "manual");
-            } else
-                db.folder().setFolderSyncState(fid, "requested");
-
-            if (account == null) // Outbox
-                ServiceSend.start(context);
-            else if (foreground && !"connected".equals(account.state))
-                ServiceUI.process(context, fid);
-
-            Log.i("Queued sync folder=" + folder + " foreground=" + foreground);
-        }
-    }
 
-    private static void queue(Context context, DB db, EntityMessage message, String name, JSONArray jargs) {
         long folder = message.folder;
         try {
             if (SEEN.equals(name)) {
@@ -249,6 +214,38 @@ public class EntityOperation {
         }
     }
 
+    static void sync(Context context, long fid, boolean foreground) {
+        DB db = DB.getInstance(context);
+        if (db.operation().getOperationCount(fid, EntityOperation.SYNC) == 0) {
+
+            EntityFolder folder = db.folder().getFolder(fid);
+            EntityAccount account = null;
+            if (folder.account != null)
+                account = db.account().getAccount(folder.account);
+
+            EntityOperation operation = new EntityOperation();
+            operation.folder = folder.id;
+            operation.message = null;
+            operation.name = SYNC;
+            operation.args = folder.getSyncArgs().toString();
+            operation.created = new Date().getTime();
+            operation.id = db.operation().insertOperation(operation);
+
+            if (account != null && !"connected".equals(account.state)) {
+                db.folder().setFolderState(fid, "waiting");
+                db.folder().setFolderSyncState(fid, "manual");
+            } else
+                db.folder().setFolderSyncState(fid, "requested");
+
+            if (account == null) // Outbox
+                ServiceSend.start(context);
+            else if (foreground && !"connected".equals(account.state))
+                ServiceUI.process(context, fid);
+
+            Log.i("Queued sync folder=" + folder + " foreground=" + foreground);
+        }
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof EntityOperation) {