Keep alive via the watchdog

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

@@ -115,7 +115,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
                         getMainHandler().postDelayed(new Runnable() {
                             @Override
                             public void run() {
-                                ServiceSynchronize.eval(ActivityMain.this, "main");
+                                ServiceSynchronize.watchdog(ActivityMain.this);
                                 ServiceSend.watchdog(ActivityMain.this);
                             }
                         }, SERVICE_START_DELAY);

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

@@ -174,15 +174,10 @@ public class ApplicationEx extends Application
 
         DisconnectBlacklist.init(this);
 
-        boolean watchdog = prefs.getBoolean("watchdog", true);
-        boolean enabled = prefs.getBoolean("enabled", true);
-        if (watchdog && enabled)
-            WorkerWatchdog.init(this);
-        else {
-            ServiceSynchronize.watchdog(this);
-            ServiceSend.watchdog(this);
-        }
+        ServiceSynchronize.watchdog(this);
+        ServiceSend.watchdog(this);
 
+        WorkerWatchdog.init(this);
         WorkerCleanup.init(this);
 
         registerReceiver(onScreenOff, new IntentFilter(Intent.ACTION_SCREEN_OFF));

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

@@ -2502,12 +2502,9 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
     }
 
     static void watchdog(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        boolean enabled = prefs.getBoolean("enabled", true);
-        if (enabled)
-            start(context,
-                    new Intent(context, ServiceSynchronize.class)
-                            .setAction("watchdog"));
+        start(context,
+                new Intent(context, ServiceSynchronize.class)
+                        .setAction("watchdog"));
     }
 
     static void restart(Context context) {