Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Switch to alarm manager for more control over polling"

Browse Source 
This reverts commit 7658047300.
This commit is contained in:
M66B
2020-01-10 12:08:14 +01:00
parent 7658047300
commit 9306d4e1e9
6 changed files with 150 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@@ -121,9 +121,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
));
static final int PI_ALARM = 1;
static final int PI_POLL = 2;
static final int PI_BACKOFF = 3;
static final int PI_KEEPALIVE = 4;
static final int PI_BACKOFF = 2;
static final int PI_KEEPALIVE = 3;
@Override
public void onCreate() {
@@ -225,12 +224,11 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
// Some networks disallow email server connections:
// - reload on network type change when disconnected
if (reload || sync ||
if (reload ||
prev.canRun() != current.canRun() ||
!prev.accountState.equals(current.accountState) ||
(!"connected".equals(current.accountState.state) &&
!Objects.equals(prev.networkState.getType(), current.networkState.getType()))) {
if (prev.canRun() || current.canRun())
EntityLog.log(ServiceSynchronize.this, "### changed " + current +
" reload=" + reload +
@@ -241,14 +239,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
" enabled=" + current.accountState.synchronize +
" state=" + current.accountState.state +
" type=" + prev.networkState.getType() + "/" + current.networkState.getType());
if (prev.canRun())
if (sync && current.canRun()) {
sync(current);
continue;
} else
stop(prev);
stop(prev);
if (current.canRun())
start(current, current.accountState.isEnabled(current.enabled) || sync);
}
@@ -333,22 +325,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
});
}
private void sync(final TupleAccountNetworkState accountNetworkState) {
EntityLog.log(ServiceSynchronize.this, "Service sync=" + accountNetworkState);
queue.submit(new Runnable() {
@Override
public void run() {
DB db = DB.getInstance(ServiceSynchronize.this);
List<EntityFolder> folders = db.folder().getSynchronizingFolders(accountNetworkState.accountState.id);
if (folders.size() > 0)
Collections.sort(folders, folders.get(0).getComparator(ServiceSynchronize.this));
for (EntityFolder folder : folders)
EntityOperation.sync(ServiceSynchronize.this, folder.id, false);
}
});
}
private void delete(final TupleAccountNetworkState accountNetworkState) {
EntityLog.log(ServiceSynchronize.this, "Service delete=" + accountNetworkState);
@@ -637,7 +613,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
private void onEval(Intent intent) {
Bundle command = new Bundle();
command.putString("name", "eval");
command.putBoolean("sync", intent.getBooleanExtra("sync", false));
command.putLong("account", intent.getLongExtra("account", -1));
liveAccountNetworkState.post(command);
}
@@ -1565,46 +1540,31 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
}
private static void schedule(Context context) {
Intent alarm = new Intent(context, ServiceSynchronize.class);
alarm.setAction("alarm");
PendingIntent piAlarm = PendingIntentCompat.getForegroundService(
context, PI_ALARM, alarm, PendingIntent.FLAG_UPDATE_CURRENT);
Intent poll = new Intent(context, ServiceSynchronize.class);
poll.setAction("poll");
PendingIntent piPoll = PendingIntentCompat.getForegroundService(
context, PI_POLL, poll, PendingIntent.FLAG_UPDATE_CURRENT);
Intent intent = new Intent(context, ServiceSynchronize.class);
intent.setAction("alarm");
PendingIntent pi = PendingIntentCompat.getForegroundService(
context, PI_ALARM, intent, PendingIntent.FLAG_UPDATE_CURRENT);
AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
am.cancel(piAlarm);
am.cancel(piPoll);
am.cancel(pi);
boolean enabled;
long now = new Date().getTime();
long[] schedule = getSchedule(context);
if (schedule == null)
enabled = true;
else {
long next = (now < schedule[0] ? schedule[0] : schedule[1]);
enabled = (now >= schedule[0] && now < schedule[1]);
return;
Log.i("Schedule now=" + new Date(now));
Log.i("Schedule start=" + new Date(schedule[0]));
Log.i("Schedule end=" + new Date(schedule[1]));
Log.i("Schedule next=" + new Date(next));
Log.i("Schedule enabled=" + enabled);
long now = new Date().getTime();
long next = (now < schedule[0] ? schedule[0] : schedule[1]);
boolean enabled = (now >= schedule[0] && now < schedule[1]);
AlarmManagerCompat.setAndAllowWhileIdle(am, AlarmManager.RTC_WAKEUP, next, piAlarm);
}
Log.i("Schedule now=" + new Date(now));
Log.i("Schedule start=" + new Date(schedule[0]));
Log.i("Schedule end=" + new Date(schedule[1]));
Log.i("Schedule next=" + new Date(next));
Log.i("Schedule enabled=" + enabled);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int pollInterval = prefs.getInt("poll_interval", 0);
if (enabled && pollInterval > 0) {
long interval = pollInterval * 60 * 1000L;
long trigger = now / interval * interval + interval;
Log.i("Poll interval=" + pollInterval + " trigger=" + new Date(trigger));
am.setInexactRepeating(AlarmManager.RTC_WAKEUP, trigger, interval, piPoll);
}
AlarmManagerCompat.setAndAllowWhileIdle(am, AlarmManager.RTC_WAKEUP, next, pi);
WorkerPoll.init(context, enabled);
}
private static long[] getSchedule(Context context) {
@@ -1700,15 +1660,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
.putExtra("reason", reason));
}
static void poll(Context context, Long account) {
ContextCompat.startForegroundService(context,
new Intent(context, ServiceSynchronize.class)
.setAction("eval")
.putExtra("account", account == null ? -1 : account)
.putExtra("sync", true)
.putExtra("reason", "poll"));
}
static void reload(Context context, Long account, String reason) {
ContextCompat.startForegroundService(context,
new Intent(context, ServiceSynchronize.class)