Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 13:47:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Schedule poll after start of schedule

Browse Source
This commit is contained in:
M66B
2020-08-30 09:34:51 +02:00
parent dbefb3b76c
commit ceab470840
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/eu/faircode/email/ServiceUI.java
View File

@@ -548,7 +548,7 @@ public class ServiceUI extends IntentService {
long now = new Date().getTime();
long[] schedule = ServiceSynchronize.getSchedule(this);
boolean poll = (schedule == null || (now >= schedule[0] && now < schedule[1]));
schedule(this, poll);
schedule(this, poll, null);
}
}
@@ -562,7 +562,7 @@ public class ServiceUI extends IntentService {
.setAction(account == null ? "sync" : "sync:" + account));
}
static void schedule(Context context, boolean poll) {
static void schedule(Context context, boolean poll, Long at) {
Intent intent = new Intent(context, ServiceUI.class);
intent.setAction("sync");
intent.putExtra("reschedule", true);
@@ -572,20 +572,23 @@ public class ServiceUI extends IntentService {
AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
am.cancel(piSync);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean enabled = prefs.getBoolean("enabled", true);
int pollInterval = prefs.getInt("poll_interval", ServiceSynchronize.DEFAULT_POLL_INTERVAL);
if (poll && enabled && pollInterval > 0) {
long now = new Date().getTime();
long interval = pollInterval * 60 * 1000L;
long next = now + interval - now % interval + 30 * 1000L;
if (next < now + interval / 5)
next += interval;
if (at == null) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean enabled = prefs.getBoolean("enabled", true);
int pollInterval = prefs.getInt("poll_interval", ServiceSynchronize.DEFAULT_POLL_INTERVAL);
if (poll && enabled && pollInterval > 0) {
long now = new Date().getTime();
long interval = pollInterval * 60 * 1000L;
long next = now + interval - now % interval + 30 * 1000L;
if (next < now + interval / 5)
next += interval;
EntityLog.log(context, "Poll next=" + new Date(next));
EntityLog.log(context, "Poll next=" + new Date(next));
AlarmManagerCompat.setAndAllowWhileIdle(am, AlarmManager.RTC_WAKEUP, next, piSync);
}
AlarmManagerCompat.setAndAllowWhileIdle(am, AlarmManager.RTC_WAKEUP, next, piSync);
}
} else
AlarmManagerCompat.setAndAllowWhileIdle(am, AlarmManager.RTC_WAKEUP, at, piSync);
}
private static PendingIntent getBannerIntent(Context context) {