Synchronize reload

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

@@ -332,7 +332,7 @@ public class ServiceSynchronize extends LifecycleService {
                     break;
 
                 case "reload":
-                    serviceManager.queue_reload(true, intent.getStringExtra("reason"));
+                    serviceManager.service_reload(intent.getStringExtra("reason"));
                     break;
 
                 case "clear":
@@ -2545,41 +2545,47 @@ public class ServiceSynchronize extends LifecycleService {
 
         @Override
         public void onAvailable(Network network) {
-            try {
+            synchronized (queue) {
-                ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+                try {
-                EntityLog.log(ServiceSynchronize.this, "Available " + network + " " + cm.getNetworkInfo(network));
+                    ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+                    EntityLog.log(ServiceSynchronize.this, "Available " + network + " " + cm.getNetworkInfo(network));
 
-                if (!started && suitableNetwork())
+                    if (!started && suitableNetwork())
-                    queue_reload(true, "connect " + network);
+                        queue_reload(true, "connect " + network);
-            } catch (Throwable ex) {
+                } catch (Throwable ex) {
-                Log.e(ex);
+                    Log.e(ex);
+                }
             }
         }
 
         @Override
         public void onCapabilitiesChanged(Network network, NetworkCapabilities capabilities) {
-            try {
+            synchronized (queue) {
-                if (!started) {
+                try {
-                    EntityLog.log(ServiceSynchronize.this, "Network " + network + " capabilities " + capabilities);
+                    if (!started) {
-                    if (suitableNetwork())
+                        EntityLog.log(ServiceSynchronize.this, "Network " + network + " capabilities " + capabilities);
-                        queue_reload(true, "connect " + network);
+                        if (suitableNetwork())
+                            queue_reload(true, "connect " + network);
+                    }
+                } catch (Throwable ex) {
+                    Log.e(ex);
                 }
-            } catch (Throwable ex) {
-                Log.e(ex);
             }
         }
 
         @Override
         public void onLost(Network network) {
-            try {
+            synchronized (queue) {
-                EntityLog.log(ServiceSynchronize.this, "Lost " + network);
+                try {
+                    EntityLog.log(ServiceSynchronize.this, "Lost " + network);
 
-                if (started && !suitableNetwork()) {
+                    if (started && !suitableNetwork()) {
-                    lastLost = new Date().getTime();
+                        lastLost = new Date().getTime();
-                    queue_reload(false, "disconnect " + network);
+                        queue_reload(false, "disconnect " + network);
+                    }
+                } catch (Throwable ex) {
+                    Log.e(ex);
                 }
-            } catch (Throwable ex) {
-                Log.e(ex);
             }
         }
 
@@ -2606,10 +2612,22 @@ public class ServiceSynchronize extends LifecycleService {
             EntityLog.log(ServiceSynchronize.this, "Service init");
         }
 
+        private void service_reload(String reason) {
+            synchronized (queue) {
+                try {
+                    serviceManager.queue_reload(true, reason);
+                } catch (Throwable ex) {
+                    Log.e(ex);
+                }
+            }
+        }
+
         private void service_destroy() {
-            EntityLog.log(ServiceSynchronize.this, "Service destroy");
+            synchronized (queue) {
-            if (started)
+                EntityLog.log(ServiceSynchronize.this, "Service destroy");
-                queue_reload(false, "service destroy");
+                if (started)
+                    queue_reload(false, "service destroy");
+            }
         }
 
         private void start() {