From c036239c343b174048159ba1b298eebf53ef9ec4 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 3 Nov 2022 09:14:54 +0100 Subject: [PATCH] Refactoring --- .../java/eu/faircode/email/FragmentOptionsPrivacy.java | 2 +- app/src/main/java/eu/faircode/email/Helper.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java index d6787e5716..b3d10838ea 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java @@ -325,7 +325,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer } }); - tvAutoLockNavHint.setText(getString(R.string.title_advanced_display_autolock_nav_hint, Helper.AUTOLOCK_GRACE)); + tvAutoLockNavHint.setText(getString(R.string.title_advanced_display_autolock_nav_hint, Helper.AUTH_AUTOLOCK_GRACE)); swClientId.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 23a8d89e0d..d450222451 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -181,7 +181,8 @@ public class Helper { static final int WAKELOCK_MAX = 30 * 60 * 1000; // milliseconds static final int BUFFER_SIZE = 8192; // Same as in Files class static final long MIN_REQUIRED_SPACE = 100 * 1000L * 1000L; - static final int AUTOLOCK_GRACE = 15; // seconds + static final long AUTH_AUTOCANCEL_TIMEOUT = 60 * 1000L; // milliseconds + static final int AUTH_AUTOLOCK_GRACE = 15; // seconds static final long PIN_FAILURE_DELAY = 3; // seconds static final String PGP_OPENKEYCHAIN_PACKAGE = "org.sufficientlysecure.keychain"; @@ -2625,7 +2626,7 @@ public class Helper { return true; if (autolock_nav && pausing) - last_authentication = now - biometrics_timeout + AUTOLOCK_GRACE * 1000L; + last_authentication = now - biometrics_timeout + AUTH_AUTOLOCK_GRACE * 1000L; else last_authentication = now; prefs.edit().putLong("last_authentication", last_authentication).apply(); @@ -2744,7 +2745,7 @@ public class Helper { } }; - ApplicationEx.getMainHandler().postDelayed(cancelPrompt, 60 * 1000L); + ApplicationEx.getMainHandler().postDelayed(cancelPrompt, AUTH_AUTOCANCEL_TIMEOUT); owner.getLifecycle().addObserver(new LifecycleObserver() { @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)