Fixed scheduling daily / sync workers

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

@@ -129,13 +129,15 @@ public class WorkerDailyRules extends Worker {
         try {
             if (enabled) {
                 Calendar cal = Calendar.getInstance();
-                long delay = cal.getTimeInMillis();
+                long now = cal.getTimeInMillis();
                 cal.set(Calendar.MILLISECOND, 0);
                 cal.set(Calendar.SECOND, 0);
                 cal.set(Calendar.MINUTE, 0);
                 cal.set(Calendar.HOUR_OF_DAY, 1);
-                cal.add(Calendar.DAY_OF_MONTH, 1);
+                long delay = cal.getTimeInMillis() - now;
-                delay = cal.getTimeInMillis() - delay;
+                if (delay < 0)
+                    cal.add(Calendar.DATE, 1);
+                delay = cal.getTimeInMillis() - now;
 
                 Log.i("Queuing " + getName() + " delay=" + (delay / (60 * 1000L)) + "m");
                 PeriodicWorkRequest.Builder builder =

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

@@ -72,16 +72,19 @@ public class WorkerSync extends Worker {
         String user = prefs.getString("cloud_user", null);
         String password = prefs.getString("cloud_password", null);
         boolean enabled = !(TextUtils.isEmpty(user) || TextUtils.isEmpty(password));
+        Log.i("Cloud worker enabled=" + enabled);
         try {
             if (enabled) {
                 Calendar cal = Calendar.getInstance();
-                long delay = cal.getTimeInMillis();
+                long now = cal.getTimeInMillis();
                 cal.set(Calendar.MILLISECOND, 0);
                 cal.set(Calendar.SECOND, 0);
                 cal.set(Calendar.MINUTE, 30);
-                cal.set(Calendar.HOUR_OF_DAY, 1);
+                cal.set(Calendar.HOUR_OF_DAY, 8);
-                cal.add(Calendar.DAY_OF_MONTH, 1);
+                long delay = cal.getTimeInMillis() - now;
-                delay = cal.getTimeInMillis() - delay;
+                if (delay < 0)
+                    cal.add(Calendar.DATE, 1);
+                delay = cal.getTimeInMillis() - now;
 
                 EntityLog.log(context, EntityLog.Type.Cloud,
                         "Queuing " + getName() + " delay=" + (delay / (60 * 1000L)) + "m");