From c09b82fc852884809a0c3f6edff024cc2c1d2245 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 9 Dec 2019 19:44:27 +0100 Subject: [PATCH] Account specific reload --- .../java/eu/faircode/email/ActivityEML.java | 2 +- .../java/eu/faircode/email/ActivityMain.java | 2 +- .../java/eu/faircode/email/ActivitySetup.java | 4 +- .../eu/faircode/email/AdapterAccount.java | 2 +- .../eu/faircode/email/AdapterAttachment.java | 2 +- .../java/eu/faircode/email/AdapterFolder.java | 6 ++- .../java/eu/faircode/email/AdapterImage.java | 2 +- .../eu/faircode/email/AdapterMessage.java | 22 ++++----- .../eu/faircode/email/FragmentAccount.java | 4 +- .../eu/faircode/email/FragmentAccounts.java | 2 +- .../eu/faircode/email/FragmentCompose.java | 4 +- .../eu/faircode/email/FragmentFolder.java | 36 +++++++++++---- .../eu/faircode/email/FragmentFolders.java | 10 +++-- .../java/eu/faircode/email/FragmentGmail.java | 2 +- .../eu/faircode/email/FragmentMessages.java | 24 +++++----- .../email/FragmentOptionsSynchronize.java | 18 ++++---- .../java/eu/faircode/email/FragmentPop.java | 4 +- .../eu/faircode/email/FragmentQuickSetup.java | 2 +- app/src/main/java/eu/faircode/email/Log.java | 2 +- .../eu/faircode/email/ServiceExternal.java | 4 +- .../java/eu/faircode/email/ServiceSend.java | 2 +- .../eu/faircode/email/ServiceSynchronize.java | 45 +++++++++++-------- .../email/ServiceTileSynchronize.java | 2 +- .../java/eu/faircode/email/ServiceUI.java | 10 ++--- .../java/eu/faircode/email/WorkerPoll.java | 2 +- .../eu/faircode/email/WorkerWatchdog.java | 2 +- 26 files changed, 125 insertions(+), 92 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java index 762af9c91d..3ae89b7c5f 100644 --- a/app/src/main/java/eu/faircode/email/ActivityEML.java +++ b/app/src/main/java/eu/faircode/email/ActivityEML.java @@ -351,7 +351,7 @@ public class ActivityEML extends ActivityBase { } EntityOperation.sync(context, inbox.id, true); - ServiceSynchronize.eval(context, false, "EML"); + ServiceSynchronize.eval(context, "EML"); } return account.name + "/" + inbox.name; diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java index 3944c20a2c..9fccc09345 100644 --- a/app/src/main/java/eu/faircode/email/ActivityMain.java +++ b/app/src/main/java/eu/faircode/email/ActivityMain.java @@ -97,7 +97,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack startActivity(view); } - ServiceSynchronize.eval(ActivityMain.this, false, "main"); + ServiceSynchronize.eval(ActivityMain.this, "main"); ServiceSend.watchdog(ActivityMain.this); } else startActivity(new Intent(ActivityMain.this, ActivitySetup.class)); diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index a547d54576..104d503756 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -382,7 +382,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac handleImport(data, this.password); break; case REQUEST_IMPORT_OAUTH: - ServiceSynchronize.eval(this, false, "import/oauth"); + ServiceSynchronize.eval(this, "import/oauth"); break; case REQUEST_IMPORT_CERTIFICATE: if (resultCode == RESULT_OK && data != null) @@ -1013,7 +1013,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac } } - ServiceSynchronize.eval(ActivitySetup.this, false, "import"); + ServiceSynchronize.eval(ActivitySetup.this, "import"); } @Override diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java index aef6928c11..d895bae081 100644 --- a/app/src/main/java/eu/faircode/email/AdapterAccount.java +++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java @@ -272,7 +272,7 @@ public class AdapterAccount extends RecyclerView.Adapter 0) - throw new IllegalArgumentException( - context.getResources().getQuantityString( - R.plurals.title_notification_operations, count, count)); - db.folder().setFolderTbd(id); - - ServiceSynchronize.eval(context, true, "delete folder"); + try { + db.beginTransaction(); + + folder = db.folder().getFolder(id); + if (folder == null) + return null; + + int count = db.operation().getOperationCount(folder.id, null); + if (count > 0) + throw new IllegalArgumentException( + context.getResources().getQuantityString( + R.plurals.title_notification_operations, count, count)); + + db.folder().setFolderTbd(folder.id); + + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + + ServiceSynchronize.reload(context, folder.account, "delete folder"); return null; } diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index f65aa13f0c..3589d9ee27 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -348,7 +348,11 @@ public class FragmentFolders extends FragmentBase { db.endTransaction(); } - ServiceSynchronize.eval(context, aid > 0, "refresh/folders"); + if (aid < 0) + ServiceSynchronize.eval(context, "refresh/folders"); + else + ServiceSynchronize.reload(context, aid, "refresh/folders"); + if (outbox) ServiceSend.start(context); @@ -516,7 +520,7 @@ public class FragmentFolders extends FragmentBase { db.endTransaction(); } - ServiceSynchronize.eval(context, false, "refresh/folder"); + ServiceSynchronize.eval(context, "refresh/folder"); if (!now) throw new IllegalArgumentException(context.getString(R.string.title_no_connection)); @@ -608,7 +612,7 @@ public class FragmentFolders extends FragmentBase { db.endTransaction(); } - ServiceSynchronize.eval(context, false, "delete"); + ServiceSynchronize.eval(context, "delete"); return null; } diff --git a/app/src/main/java/eu/faircode/email/FragmentGmail.java b/app/src/main/java/eu/faircode/email/FragmentGmail.java index a5f99c8e6f..5d6b8d8b3c 100644 --- a/app/src/main/java/eu/faircode/email/FragmentGmail.java +++ b/app/src/main/java/eu/faircode/email/FragmentGmail.java @@ -383,7 +383,7 @@ public class FragmentGmail extends FragmentBase { db.endTransaction(); } - ServiceSynchronize.eval(context, false, "Gmail"); + ServiceSynchronize.eval(context, "Gmail"); return null; } diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 79ec840517..22d3fb8439 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1192,7 +1192,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. db.endTransaction(); } - ServiceSynchronize.eval(context, false, "refresh"); + ServiceSynchronize.eval(context, "refresh"); if (!now) throw new IllegalArgumentException(context.getString(R.string.title_no_connection)); @@ -2031,7 +2031,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. db.endTransaction(); } - ServiceSynchronize.eval(context, false, "seen"); + ServiceSynchronize.eval(context, "seen"); return null; } @@ -2166,7 +2166,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. db.endTransaction(); } - ServiceSynchronize.eval(context, false, "flag"); + ServiceSynchronize.eval(context, "flag"); return null; } @@ -3485,7 +3485,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. db.endTransaction(); } - ServiceSynchronize.eval(context, false, "expand"); + ServiceSynchronize.eval(context, "expand"); return null; } @@ -3626,7 +3626,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. db.endTransaction(); } - ServiceSynchronize.eval(context, false, "move"); + ServiceSynchronize.eval(context, "move"); return null; } @@ -3750,7 +3750,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. db.endTransaction(); } - ServiceSynchronize.eval(context, false, "move"); + ServiceSynchronize.eval(context, "move"); } }, "messages:movetimeout"); thread.setPriority(THREAD_PRIORITY_BACKGROUND); @@ -4728,7 +4728,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. db.endTransaction(); } - ServiceSynchronize.eval(context, false, "delete"); + ServiceSynchronize.eval(context, "delete"); return null; } @@ -4765,7 +4765,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. db.endTransaction(); } - ServiceSynchronize.eval(context, false, "delete"); + ServiceSynchronize.eval(context, "delete"); return null; } @@ -4802,7 +4802,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. db.endTransaction(); } - ServiceSynchronize.eval(context, false, "move"); + ServiceSynchronize.eval(context, "move"); return null; } @@ -4863,7 +4863,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. } }); - ServiceSynchronize.eval(context, false, "flag"); + ServiceSynchronize.eval(context, "flag"); return null; } @@ -5016,7 +5016,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. db.endTransaction(); } - ServiceSynchronize.eval(context, false, "copy"); + ServiceSynchronize.eval(context, "copy"); return result; } @@ -5201,7 +5201,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. db.endTransaction(); } - ServiceSynchronize.eval(context, false, "delete"); + ServiceSynchronize.eval(context, "delete"); return null; } diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java index 1ec4a8eaf3..72013a2240 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java @@ -106,7 +106,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { prefs.edit().putBoolean("enabled", checked).apply(); - ServiceSynchronize.eval(getContext(), false, "enabled=" + checked); + ServiceSynchronize.eval(getContext(), "enabled=" + checked); } }); @@ -121,7 +121,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr adapterView.setTag(value); prefs.edit().putInt("poll_interval", value).apply(); if (value == 0) - ServiceSynchronize.eval(getContext(), false, "poll_interval"); + ServiceSynchronize.eval(getContext(), "poll_interval"); WorkerPoll.init(getContext()); } } @@ -130,7 +130,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr public void onNothingSelected(AdapterView adapterView) { adapterView.setTag(null); prefs.edit().remove("poll_interval").apply(); - ServiceSynchronize.eval(getContext(), false, "poll_interval"); + ServiceSynchronize.eval(getContext(), "poll_interval"); WorkerPoll.init(getContext()); } }); @@ -172,7 +172,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { prefs.edit().putBoolean("sync_unseen", checked).apply(); - ServiceSynchronize.eval(getContext(), true, "sync_unseen=" + checked); + ServiceSynchronize.reload(getContext(), -1, "sync_unseen=" + checked); } }); @@ -180,7 +180,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { prefs.edit().putBoolean("sync_flagged", checked).apply(); - ServiceSynchronize.eval(getContext(), true, "sync_flagged=" + checked); + ServiceSynchronize.reload(getContext(), -1, "sync_flagged=" + checked); } }); @@ -188,7 +188,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { prefs.edit().putBoolean("delete_unseen", checked).apply(); - ServiceSynchronize.eval(getContext(), true, "delete_unseen=" + checked); + ServiceSynchronize.reload(getContext(), -1, "delete_unseen=" + checked); } }); @@ -196,7 +196,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { prefs.edit().putBoolean("sync_kept", checked).apply(); - ServiceSynchronize.eval(getContext(), true, "sync_kept=" + checked); + ServiceSynchronize.reload(getContext(), -1, "sync_kept=" + checked); } }); @@ -204,7 +204,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { prefs.edit().putBoolean("sync_folders", checked).apply(); - ServiceSynchronize.eval(getContext(), true, "sync_folders=" + checked); + ServiceSynchronize.reload(getContext(), -1, "sync_folders=" + checked); } }); @@ -221,7 +221,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { prefs.edit().putBoolean("subscribed_only", checked).apply(); - ServiceSynchronize.eval(getContext(), true, "subscribed_only"); + ServiceSynchronize.reload(getContext(), -1, "subscribed_only"); } }); diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java index 37fa8979cc..2ddedb2996 100644 --- a/app/src/main/java/eu/faircode/email/FragmentPop.java +++ b/app/src/main/java/eu/faircode/email/FragmentPop.java @@ -374,7 +374,7 @@ public class FragmentPop extends FragmentBase { db.endTransaction(); } - ServiceSynchronize.eval(context, false, "save account"); + ServiceSynchronize.eval(context, "save account"); if (!synchronize) { NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); @@ -562,7 +562,7 @@ public class FragmentPop extends FragmentBase { DB db = DB.getInstance(context); db.account().setAccountTbd(id); - ServiceSynchronize.eval(context, false, "delete account"); + ServiceSynchronize.eval(context, "delete account"); return null; } diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java index 688302e138..8f5647857a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java @@ -350,7 +350,7 @@ public class FragmentQuickSetup extends FragmentBase { db.endTransaction(); } - ServiceSynchronize.eval(context, false, "quick setup"); + ServiceSynchronize.eval(context, "quick setup"); return null; } diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java index fb5476d2c7..ade1d905ff 100644 --- a/app/src/main/java/eu/faircode/email/Log.java +++ b/app/src/main/java/eu/faircode/email/Log.java @@ -643,7 +643,7 @@ public class Log { db.endTransaction(); } - ServiceSynchronize.eval(context, false, "debuginfo"); + ServiceSynchronize.eval(context, "debuginfo"); return draft; } diff --git a/app/src/main/java/eu/faircode/email/ServiceExternal.java b/app/src/main/java/eu/faircode/email/ServiceExternal.java index 2e8f870f5e..d9d5fecc47 100644 --- a/app/src/main/java/eu/faircode/email/ServiceExternal.java +++ b/app/src/main/java/eu/faircode/email/ServiceExternal.java @@ -103,7 +103,7 @@ public class ServiceExternal extends Service { boolean previous = prefs.getBoolean("enabled", true); if (!enabled.equals(previous)) { prefs.edit().putBoolean("enabled", enabled).apply(); - ServiceSynchronize.eval(this, false, "external"); + ServiceSynchronize.eval(this, "external"); } } else { final Context context = getApplicationContext(); @@ -114,7 +114,7 @@ public class ServiceExternal extends Service { EntityAccount account = db.account().getAccount(accountName); if (account != null) { db.account().setAccountSynchronize(account.id, enabled); - ServiceSynchronize.eval(context, false, "account enabled=" + enabled); + ServiceSynchronize.eval(context, "account enabled=" + enabled); } } }); diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java index ef848da1ec..c76cde88d0 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSend.java +++ b/app/src/main/java/eu/faircode/email/ServiceSend.java @@ -470,7 +470,7 @@ public class ServiceSend extends ServiceBase { db.endTransaction(); } - ServiceSynchronize.eval(ServiceSend.this, false, "sent"); + ServiceSynchronize.eval(ServiceSend.this, "sent"); NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); nm.cancel("send:" + message.identity, 1); diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index d29cc82f3b..060c57fa31 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -121,25 +121,25 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences private ConnectionHelper.NetworkState lastNetworkState = null; private List lastAccountStates = null; - private void post(boolean reload) { + private void postReload(Long reload) { post(reload, lastNetworkState, lastAccountStates); } private void post(ConnectionHelper.NetworkState networkState) { lastNetworkState = networkState; - post(false, lastNetworkState, lastAccountStates); + post(null, lastNetworkState, lastAccountStates); } private void post(List accountStates) { lastAccountStates = accountStates; - post(false, lastNetworkState, lastAccountStates); + post(null, lastNetworkState, lastAccountStates); } private void postDestroy() { postValue(null); } - private void post(boolean reload, ConnectionHelper.NetworkState networkState, List accountStates) { + private void post(Long reload, ConnectionHelper.NetworkState networkState, List accountStates) { if (Looper.myLooper() == Looper.getMainLooper()) _post(reload, networkState, accountStates); else { @@ -154,7 +154,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences } } - private void _post(boolean reload, ConnectionHelper.NetworkState networkState, List accountStates) { + private void _post(Long reload, ConnectionHelper.NetworkState networkState, List accountStates) { if (networkState != null && accountStates != null) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSynchronize.this); boolean enabled = prefs.getBoolean("enabled", true); @@ -168,7 +168,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences for (TupleAccountState accountState : accountStates) result.add(new TupleAccountNetworkState( enabled && pollInterval == 0 && scheduled, - reload, + reload != null && (reload < 0 || accountState.id.equals(reload)), networkState, accountState)); postValue(result); @@ -531,9 +531,9 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { if (PREF_EVAL.contains(key)) - liveAccountNetworkState.post(false); + liveAccountNetworkState.postReload(null); else if (PREF_RELOAD.contains(key)) - liveAccountNetworkState.post(true); + liveAccountNetworkState.postReload(-1L); } @Override @@ -601,17 +601,19 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences try { switch (action) { case "eval": - boolean reload = intent.getBooleanExtra("reload", false); - liveAccountNetworkState.post(reload); + Long reload = null; + if (intent.hasExtra("reload")) + reload = intent.getLongExtra("reload", -1); + liveAccountNetworkState.postReload(reload); break; case "alarm": schedule(this); - eval(this, false, "alarm"); + eval(this, "alarm"); break; case "reset": - eval(this, true, "reset"); + reload(this, -1, "reset"); break; default: @@ -805,7 +807,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences String name = e.getFolder().getFullName(); Log.i("Folder created=" + name); if (db.folder().getFolderByName(account.id, name) == null) - eval(ServiceSynchronize.this, true, "folder created"); + reload(ServiceSynchronize.this, account.id, "folder created"); } finally { wlFolder.release(); } @@ -823,7 +825,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences int count = db.folder().renameFolder(account.id, old, name); Log.i("Renamed to " + name + " count=" + count); if (count == 0) - eval(ServiceSynchronize.this, true, "folder renamed"); + reload(ServiceSynchronize.this, account.id, "folder renamed"); } finally { wlFolder.release(); } @@ -837,7 +839,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences String name = e.getFolder().getFullName(); Log.i("Folder deleted=" + name); if (db.folder().getFolderByName(account.id, name) != null) - eval(ServiceSynchronize.this, true, "folder deleted"); + reload(ServiceSynchronize.this, account.id, "folder deleted"); } finally { wlFolder.release(); } @@ -1381,7 +1383,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences // Conditionally init service int accounts = db.account().getSynchronizingAccounts().size(); if (accounts > 0) - eval(context, false, "boot"); + eval(context, "boot"); else { for (EntityAccount account : db.account().getAccounts()) db.account().setAccountState(account.id, null); @@ -1473,11 +1475,18 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences return new long[]{start, end}; } - static void eval(Context context, boolean reload, String reason) { + static void eval(Context context, String reason) { ContextCompat.startForegroundService(context, new Intent(context, ServiceSynchronize.class) .setAction("eval") - .putExtra("reload", reload) + .putExtra("reason", reason)); + } + + static void reload(Context context, long account, String reason) { + ContextCompat.startForegroundService(context, + new Intent(context, ServiceSynchronize.class) + .setAction("eval") + .putExtra("reload", account) .putExtra("reason", reason)); } diff --git a/app/src/main/java/eu/faircode/email/ServiceTileSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceTileSynchronize.java index b2e6c434ee..b5750eddf8 100644 --- a/app/src/main/java/eu/faircode/email/ServiceTileSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceTileSynchronize.java @@ -69,6 +69,6 @@ public class ServiceTileSynchronize extends TileService implements SharedPrefere SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); boolean enabled = !prefs.getBoolean("enabled", true); prefs.edit().putBoolean("enabled", enabled).apply(); - ServiceSynchronize.eval(this, false, "tile=" + enabled); + ServiceSynchronize.eval(this, "tile=" + enabled); } } diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java index 5d92ce2ca4..6731d3c194 100644 --- a/app/src/main/java/eu/faircode/email/ServiceUI.java +++ b/app/src/main/java/eu/faircode/email/ServiceUI.java @@ -195,7 +195,7 @@ public class ServiceUI extends IntentService { db.endTransaction(); } - ServiceSynchronize.eval(ServiceUI.this, false, "move"); + ServiceSynchronize.eval(ServiceUI.this, "move"); } private void onMove(long id) { @@ -218,7 +218,7 @@ public class ServiceUI extends IntentService { db.endTransaction(); } - ServiceSynchronize.eval(ServiceUI.this, false, "move"); + ServiceSynchronize.eval(ServiceUI.this, "move"); } private void onReplyDirect(long id, Intent intent) throws IOException { @@ -309,7 +309,7 @@ public class ServiceUI extends IntentService { db.endTransaction(); } - ServiceSynchronize.eval(ServiceUI.this, false, "flag"); + ServiceSynchronize.eval(ServiceUI.this, "flag"); } private void onSeen(long id) { @@ -328,7 +328,7 @@ public class ServiceUI extends IntentService { db.endTransaction(); } - ServiceSynchronize.eval(ServiceUI.this, false, "seen"); + ServiceSynchronize.eval(ServiceUI.this, "seen"); } private void onSnooze(long id) { @@ -425,7 +425,7 @@ public class ServiceUI extends IntentService { if (EntityFolder.OUTBOX.equals(folder.type)) ServiceSend.start(ServiceUI.this); else - ServiceSynchronize.eval(ServiceUI.this, false, "wakeup"); + ServiceSynchronize.eval(ServiceUI.this, "wakeup"); } private void onDaily() { diff --git a/app/src/main/java/eu/faircode/email/WorkerPoll.java b/app/src/main/java/eu/faircode/email/WorkerPoll.java index 2631f66ecc..a06b63f80a 100644 --- a/app/src/main/java/eu/faircode/email/WorkerPoll.java +++ b/app/src/main/java/eu/faircode/email/WorkerPoll.java @@ -95,7 +95,7 @@ public class WorkerPoll extends Worker { db.endTransaction(); } - ServiceSynchronize.eval(context, false, "refresh/poll"); + ServiceSynchronize.eval(context, "refresh/poll"); } private static String getName() { diff --git a/app/src/main/java/eu/faircode/email/WorkerWatchdog.java b/app/src/main/java/eu/faircode/email/WorkerWatchdog.java index 49f5d7a697..6e2725b918 100644 --- a/app/src/main/java/eu/faircode/email/WorkerWatchdog.java +++ b/app/src/main/java/eu/faircode/email/WorkerWatchdog.java @@ -44,7 +44,7 @@ public class WorkerWatchdog extends Worker { @Override public Result doWork() { Log.i("Running " + getName()); - ServiceSynchronize.eval(getApplicationContext(), false, "watchdog"); + ServiceSynchronize.eval(getApplicationContext(), "watchdog"); ServiceSend.watchdog(getApplicationContext()); return Result.success(); }