From e38056a0d3fe876929f0d663586f3081d2304a0b Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 29 Nov 2022 16:16:42 +0100 Subject: [PATCH] Revert "Poll on old Android versions" This reverts commit 0f5e53040dfb9e6b103f3a17f46bf5d79637d8a0. --- app/src/main/java/eu/faircode/email/ApplicationEx.java | 3 --- app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index 1e473cb9a4..3d26042d95 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -662,9 +662,6 @@ public class ApplicationEx extends Application else if (version < 1994) { // 2022-10-28 Spamcop blocks Google's addresses editor.putBoolean("blocklist.Spamcop", false); - } else if (version < 2011) { - if (!prefs.contains("poll_interval")) - editor.putInt("poll_interval", 0); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG) diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 218b4177f6..d78303dcff 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -3233,9 +3233,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences } static int getPollInterval(Context context) { - int def = (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O ? 15 : 0); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - return prefs.getInt("poll_interval", def); // minutes + return prefs.getInt("poll_interval", 0); // minutes } static long[] getSchedule(Context context) {