Improved watchdog

This commit is contained in:
M66B
2019-08-03 16:05:30 +02:00
parent 952d93bf17
commit f59adf17f5
4 changed files with 11 additions and 18 deletions

View File

@@ -261,10 +261,6 @@ public class ServiceSynchronize extends ServiceBase {
if (action != null)
try {
switch (action) {
case "init":
onInit();
break;
case "alarm":
onAlarm();
break;
@@ -333,11 +329,6 @@ public class ServiceSynchronize extends ServiceBase {
return builder;
}
private void onInit() {
EntityLog.log(this, "Service init");
// Network events will manage the service
}
private void onAlarm() {
schedule(this);
onReload(true, "alarm");
@@ -1437,14 +1428,9 @@ public class ServiceSynchronize extends ServiceBase {
schedule(context);
// Conditionally init service
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean enabled = prefs.getBoolean("enabled", true);
int pollInterval = prefs.getInt("poll_interval", 0);
int accounts = db.account().getSynchronizingAccounts().size();
if (enabled && pollInterval == 0 && accounts > 0)
ContextCompat.startForegroundService(context,
new Intent(context, ServiceSynchronize.class)
.setAction("init"));
if (accounts > 0)
watchdog(context);
else {
for (EntityAccount account : db.account().getAccounts())
db.account().setAccountState(account.id, null);