Added polling

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

@@ -63,6 +63,7 @@ import static android.app.Activity.RESULT_OK;
 
 public class FragmentOptions extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
     private SwitchCompat swEnabled;
+    private Spinner spPollInterval;
     private SwitchCompat swSchedule;
     private TextView tvScheduleStart;
     private TextView tvScheduleEnd;
@@ -130,7 +131,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
     };
 
     private final static String[] ADVANCED_OPTIONS = new String[]{
-            "enabled", "schedule_start", "schedule_end",
+            "enabled", "poll_interval", "schedule", "schedule_start", "schedule_end",
             "metered", "download", "roaming",
             "startup", "date", "threading", "avatars", "identicons", "circular", "name_email", "subject_italic", "flags", "preview",
             "addresses", "monospaced", "autohtml", "autoimages", "actionbar",
@@ -152,6 +153,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
 
         // Get controls
         swEnabled = view.findViewById(R.id.swEnabled);
+        spPollInterval = view.findViewById(R.id.spPollInterval);
         swSchedule = view.findViewById(R.id.swSchedule);
         tvScheduleStart = view.findViewById(R.id.tvScheduleStart);
         tvScheduleEnd = view.findViewById(R.id.tvScheduleEnd);
@@ -220,10 +222,35 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("enabled", checked).apply();
+                spPollInterval.setEnabled(checked);
+                swSchedule.setEnabled(checked);
                 ServiceSynchronize.reload(getContext(), true, "enabled=" + checked);
             }
         });
 
+        spPollInterval.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
+                Object tag = adapterView.getTag();
+                int current = (tag == null ? 0 : (Integer) tag);
+                int[] values = getResources().getIntArray(R.array.pollIntervalValues);
+                int value = values[position];
+                if (value != current) {
+                    adapterView.setTag(value);
+                    prefs.edit().putInt("poll_interval", value).apply();
+                    WorkerPoll.init(getContext());
+                    ServiceSynchronize.reload(getContext(), "poll");
+                }
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                prefs.edit().remove("poll_interval").apply();
+                WorkerPoll.init(getContext());
+                ServiceSynchronize.reload(getContext(), "poll");
+            }
+        });
+
         swSchedule.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -238,10 +265,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
                         fragmentTransaction.commit();
                     }
                 } else {
-                    SharedPreferences.Editor editor = prefs.edit();
+                    prefs.edit().putBoolean("schedule", false).apply();
-                    editor.putBoolean("schedule", false);
-                    editor.putBoolean("enabled", true);
-                    editor.apply();
                     ServiceSynchronize.reload(getContext(), "schedule=" + checked);
                 }
             }
@@ -675,8 +699,19 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
 
         swEnabled.setChecked(prefs.getBoolean("enabled", true));
-        swSchedule.setChecked(prefs.getBoolean("schedule", false));
+        spPollInterval.setEnabled(swEnabled.isChecked());
+        swSchedule.setEnabled(swEnabled.isChecked());
+
+        int pollInterval = prefs.getInt("poll_interval", 0);
+        int[] pollIntervalValues = getResources().getIntArray(R.array.pollIntervalValues);
+        for (int pos = 0; pos < pollIntervalValues.length; pos++)
+            if (pollIntervalValues[pos] == pollInterval) {
+                spPollInterval.setTag(pollInterval);
+                spPollInterval.setSelection(pos);
+                break;
+            }
 
+        swSchedule.setChecked(prefs.getBoolean("schedule", false));
         tvScheduleStart.setText(formatHour(getContext(), prefs.getInt("schedule_start", 0)));
         tvScheduleEnd.setText(formatHour(getContext(), prefs.getInt("schedule_end", 0)));
 

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

@@ -384,8 +384,9 @@ public class ServiceSynchronize extends LifecycleService {
     private boolean isEnabled() {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         boolean enabled = prefs.getBoolean("enabled", true);
+        int pollInterval = prefs.getInt("poll_interval", 0);
         boolean oneshot = prefs.getBoolean("oneshot", false);
-        return (enabled || oneshot);
+        return ((enabled && pollInterval == 0) || oneshot);
     }
 
     private void start() {
@@ -1197,10 +1198,14 @@ public class ServiceSynchronize extends LifecycleService {
                         // Restore schedule
                         schedule(context);
 
+                        // Initialize polling
+                        WorkerPoll.init(context);
+
                         // Conditionally init service
                         boolean enabled = prefs.getBoolean("enabled", true);
+                        int pollInterval = prefs.getInt("poll_interval", 0);
                         int accounts = db.account().getSynchronizingAccounts().size();
-                        if (enabled && accounts > 0)
+                        if (enabled && pollInterval == 0 && accounts > 0)
                             ContextCompat.startForegroundService(context,
                                     new Intent(context, ServiceSynchronize.class)
                                             .setAction("init"));
@@ -1307,8 +1312,14 @@ public class ServiceSynchronize extends LifecycleService {
     static void process(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean enabled = prefs.getBoolean("enabled", true);
+        if (!enabled)
+            onshot(context);
+    }
+
+    static void onshot(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean oneshot = prefs.getBoolean("oneshot", false);
-        if (!enabled && !oneshot) {
+        if (!oneshot) {
             prefs.edit().putBoolean("oneshot", true).apply();
             ContextCompat.startForegroundService(context,
                     new Intent(context, ServiceSynchronize.class)

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

@@ -0,0 +1,54 @@
+package eu.faircode.email;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import androidx.annotation.NonNull;
+import androidx.work.ExistingPeriodicWorkPolicy;
+import androidx.work.PeriodicWorkRequest;
+import androidx.work.WorkManager;
+import androidx.work.Worker;
+import androidx.work.WorkerParameters;
+
+import java.util.concurrent.TimeUnit;
+
+public class WorkerPoll extends Worker {
+    public WorkerPoll(@NonNull Context context, @NonNull WorkerParameters workerParams) {
+        super(context, workerParams);
+        Log.i("Instance " + getName());
+    }
+
+    @NonNull
+    @Override
+    public Result doWork() {
+        Log.i("Running " + getName());
+        ServiceSynchronize.onshot(getApplicationContext());
+        return Result.success();
+    }
+
+    static void init(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean enabled = prefs.getBoolean("enabled", true);
+        int pollInterval = prefs.getInt("poll_interval", 0);
+        if (enabled && pollInterval > 0) {
+            Log.i("Queuing " + getName() + " every " + pollInterval + " minutes");
+            PeriodicWorkRequest workRequest =
+                    new PeriodicWorkRequest.Builder(WorkerPoll.class, pollInterval, TimeUnit.MINUTES)
+                            .build();
+            WorkManager.getInstance(context)
+                    .enqueueUniquePeriodicWork(getName(), ExistingPeriodicWorkPolicy.REPLACE, workRequest);
+
+            Log.i("Queued " + getName());
+        } else {
+
+            Log.i("Cancelling " + getName());
+            WorkManager.getInstance(context).cancelUniqueWork(getName());
+            Log.i("Cancelled " + getName());
+        }
+    }
+
+    private static String getName() {
+        return WorkerPoll.class.getSimpleName();
+    }
+}

app/src/main/res/layout/fragment_options.xml

@@ -64,6 +64,16 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swEnabled" />
 
+            <Spinner
+                android:id="@+id/spPollInterval"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="6dp"
+                android:entries="@array/pollIntervalNames"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tvEnabledHint" />
+
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/swSchedule"
                 android:layout_width="match_parent"
@@ -73,13 +83,14 @@
                 android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_schedule"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvEnabledHint"
+                app:layout_constraintTop_toBottomOf="@id/spPollInterval"
                 app:switchPadding="12dp" />
 
             <TextView
                 android:id="@+id/tvScheduleStart"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
                 android:padding="12dp"
                 android:text="00:00"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"

app/src/main/res/values/strings.xml

@@ -633,6 +633,22 @@
     <string name="title_crash_info_remark">Please describe what you were doing when the app crashed:</string>
     <string name="title_issue_subject" translatable="false">FairEmail %1$s issue</string>
 
+    <string-array name="pollIntervalNames">
+        <item>Always</item>
+        <item>Half hour</item>
+        <item>Hour</item>
+        <item>2 hours</item>
+        <item>4 hours</item>
+    </string-array>
+
+    <integer-array name="pollIntervalValues" translatable="false">
+        <item>0</item>
+        <item>30</item>
+        <item>60</item>
+        <item>120</item>
+        <item>240</item>
+    </integer-array>
+
     <string-array name="startupValues" translatable="false">
         <item>unified</item>
         <item>folders</item>