From f3b828a00c5c71ad2b5c34a0c66db0281138c959 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 24 Aug 2019 15:39:59 +0200
Subject: [PATCH] Connect to folder on sync only

---
 .../java/eu/faircode/email/ServiceSynchronize.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 0eb863d6fc..b85acb6af9 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -98,7 +98,6 @@ public class ServiceSynchronize extends ServiceBase {
     private TupleAccountStats lastStats = new TupleAccountStats();
     private ExecutorService queue = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
 
-    private static boolean booted = false;
     private static boolean sync = true;
     private static boolean oneshot = false;
 
@@ -826,7 +825,7 @@ public class ServiceSynchronize extends ServiceBase {
                     });
 
                     for (final EntityFolder folder : folders) {
-                        if (folder.synchronize && !folder.poll && capIdle) {
+                        if (folder.synchronize && !folder.poll && capIdle && sync) {
                             Log.i(account.name + " sync folder " + folder.name);
 
                             db.folder().setFolderState(folder.id, "connecting");
@@ -1186,7 +1185,7 @@ public class ServiceSynchronize extends ServiceBase {
                                 throw new StoreClosedException(iservice.getStore(), "NOOP");
 
                             for (EntityFolder folder : mapFolders.keySet())
-                                if (folder.synchronize)
+                                if (folder.synchronize && mapFolders.get(folder) != null)
                                     if (!folder.poll && capIdle) {
                                         // Sends folder NOOP
                                         if (!mapFolders.get(folder).isOpen())
@@ -1256,7 +1255,7 @@ public class ServiceSynchronize extends ServiceBase {
                     EntityLog.log(this, account.name + " closing");
                     db.account().setAccountState(account.id, "closing");
                     for (EntityFolder folder : mapFolders.keySet())
-                        if (folder.synchronize && !folder.poll)
+                        if (folder.synchronize && !folder.poll && mapFolders.get(folder) != null)
                             db.folder().setFolderState(folder.id, "closing");
 
                     // Close store
@@ -1278,7 +1277,7 @@ public class ServiceSynchronize extends ServiceBase {
 
                     // Update state
                     for (EntityFolder folder : mapFolders.keySet())
-                        if (folder.synchronize && !folder.poll)
+                        if (folder.synchronize && !folder.poll && mapFolders.get(folder) != null)
                             db.folder().setFolderState(folder.id, null);
                 }
 
@@ -1582,7 +1581,7 @@ public class ServiceSynchronize extends ServiceBase {
         int pollInterval = prefs.getInt("poll_interval", 0);
         if (!enabled || pollInterval > 0) {
             ServiceSynchronize.sync = true;
-            oneshot = true;
+            ServiceSynchronize.oneshot = true;
         }
         ContextCompat.startForegroundService(context,
                 new Intent(context, ServiceSynchronize.class)
@@ -1595,7 +1594,7 @@ public class ServiceSynchronize extends ServiceBase {
         int pollInterval = prefs.getInt("poll_interval", 0);
         if (!enabled || pollInterval > 0) {
             ServiceSynchronize.sync = sync;
-            oneshot = true;
+            ServiceSynchronize.oneshot = true;
             ContextCompat.startForegroundService(context,
                     new Intent(context, ServiceSynchronize.class)
                             .setAction("oneshot_start"));