From 185efd00efdfcb70f99aba3895ed0a9a46462729 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 5 Apr 2020 13:54:18 +0200 Subject: [PATCH] Revert "Prevent multiple inits" This reverts commit 62675805dad50bbf41e7f76851b18b4d80fd097b. --- .../eu/faircode/email/ServiceSynchronize.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 3e151875c1..9187823c99 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -36,7 +36,6 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.PowerManager; -import android.os.SystemClock; import android.service.notification.StatusBarNotification; import android.text.TextUtils; @@ -150,8 +149,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences iif.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED); registerReceiver(connectionChangedReceiver, iif); - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - DB db = DB.getInstance(this); db.account().liveAccountState().observe(this, new Observer>() { @@ -176,6 +173,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences }); liveAccountNetworkState.observeForever(new Observer>() { + private boolean init = false; private boolean fts = false; private Integer lastQuitId = null; private List accountStates = new ArrayList<>(); @@ -194,14 +192,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences coreStates.clear(); liveAccountNetworkState.removeObserver(this); } else { - // Check init - long now = new Date().getTime(); - long init = prefs.getLong("last_init", 0); - long boot = now - SystemClock.elapsedRealtime(); - if (init < boot) { - EntityLog.log(ServiceSynchronize.this, "Boot=" + new Date(boot)); - EntityLog.log(ServiceSynchronize.this, "Last init=" + new Date(init)); - prefs.edit().putLong("last_init", now).apply(); + if (!init) { + init = true; init(); } @@ -476,6 +468,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences } }); + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); final TwoStateOwner cowner = new TwoStateOwner(this, "liveUnseenNotify");