Auto force sync

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

@@ -361,8 +361,13 @@ public class FragmentAccounts extends FragmentBase {
                     throw new IllegalStateException(context.getString(R.string.title_no_internet));
 
                 boolean now = true;
+                boolean force = false;
                 boolean outbox = false;
 
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                boolean enabled = prefs.getBoolean("enabled", true);
+                int pollInterval = prefs.getInt("poll_interval", ServiceSynchronize.DEFAULT_POLL_INTERVAL);
+
                 DB db = DB.getInstance(context);
                 try {
                     db.beginTransaction();
@@ -380,8 +385,12 @@ public class FragmentAccounts extends FragmentBase {
                             outbox = true;
                         else {
                             EntityAccount account = db.account().getAccount(folder.account);
-                            if (account != null && !"connected".equals(account.state))
+                            if (account != null && !"connected".equals(account.state)) {
                                 now = false;
+                                if (enabled && !account.ondemand &&
+                                        (pollInterval == 0 || account.poll_exempted))
+                                    force = true;
+                            }
                         }
                     }
 
@@ -390,7 +399,11 @@ public class FragmentAccounts extends FragmentBase {
                     db.endTransaction();
                 }
 
-                ServiceSynchronize.eval(context, "refresh/accounts");
+                if (force)
+                    ServiceSynchronize.reload(context, null, "forced refresh");
+                else
+                    ServiceSynchronize.eval(context, "refresh");
+
                 if (outbox)
                     ServiceSend.start(context);
 

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

@@ -349,8 +349,13 @@ public class FragmentFolders extends FragmentBase {
                     throw new IllegalStateException(context.getString(R.string.title_no_internet));
 
                 boolean now = true;
+                boolean force = false;
                 boolean outbox = false;
 
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                boolean enabled = prefs.getBoolean("enabled", true);
+                int pollInterval = prefs.getInt("poll_interval", ServiceSynchronize.DEFAULT_POLL_INTERVAL);
+
                 DB db = DB.getInstance(context);
                 try {
                     db.beginTransaction();
@@ -371,8 +376,12 @@ public class FragmentFolders extends FragmentBase {
                             outbox = true;
                         else {
                             EntityAccount account = db.account().getAccount(folder.account);
-                            if (account != null && !"connected".equals(account.state))
+                            if (account != null && !"connected".equals(account.state)) {
                                 now = false;
+                                if (enabled && !account.ondemand &&
+                                        (pollInterval == 0 || account.poll_exempted))
+                                    force = true;
+                            }
                         }
                     }
 
@@ -381,7 +390,10 @@ public class FragmentFolders extends FragmentBase {
                     db.endTransaction();
                 }
 
-                ServiceSynchronize.eval(context, "refresh/folders");
+                if (force)
+                    ServiceSynchronize.reload(context, null, "forced refresh");
+                else
+                    ServiceSynchronize.eval(context, "refresh");
 
                 if (outbox)
                     ServiceSend.start(context);

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

@@ -1353,6 +1353,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     throw new IllegalStateException(context.getString(R.string.title_no_internet));
 
                 boolean now = true;
+                boolean force = false;
+
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                boolean enabled = prefs.getBoolean("enabled", true);
+                int pollInterval = prefs.getInt("poll_interval", ServiceSynchronize.DEFAULT_POLL_INTERVAL);
 
                 DB db = DB.getInstance(context);
                 try {
@@ -1374,8 +1379,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                         if (folder.account != null) {
                             EntityAccount account = db.account().getAccount(folder.account);
-                            if (account != null && !"connected".equals(account.state))
+                            if (account != null && !"connected".equals(account.state)) {
                                 now = false;
+                                if (enabled && !account.ondemand &&
+                                        (pollInterval == 0 || account.poll_exempted))
+                                    force = true;
+                            }
                         }
                     }
 
@@ -1384,7 +1393,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     db.endTransaction();
                 }
 
-                ServiceSynchronize.eval(context, "refresh");
+                if (force)
+                    ServiceSynchronize.reload(context, null, "forced refresh");
+                else
+                    ServiceSynchronize.eval(context, "refresh");
 
                 if (!now)
                     throw new IllegalArgumentException(context.getString(R.string.title_no_connection));