From e600d8a56c0e080245b59e7e64c980cda326e11d Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Mon, 7 Dec 2020 14:08:44 +0100 Subject: [PATCH] Add temp advanced unlocking settings --- .../keepass/settings/PreferencesUtil.kt | 25 ++++++++++++++----- app/src/main/res/values/donottranslate.xml | 10 +++++--- app/src/main/res/values/strings.xml | 6 +++++ .../res/xml/preferences_advanced_unlock.xml | 17 +++++++++++++ 4 files changed, 49 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt index 90a4f67d5..d4baa0d14 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt @@ -203,6 +203,13 @@ object PreferencesUtil { ?: TimeoutHelper.DEFAULT_TIMEOUT } + fun getAdvancedUnlockTimeout(context: Context): Long { + val prefs = PreferenceManager.getDefaultSharedPreferences(context) + return prefs.getString(context.getString(R.string.temp_advanced_unlock_timeout_key), + context.getString(R.string.temp_advanced_unlock_timeout_default))?.toLong() + ?: TimeoutHelper.DEFAULT_TIMEOUT + } + fun isLockDatabaseWhenScreenShutOffEnable(context: Context): Boolean { val prefs = PreferenceManager.getDefaultSharedPreferences(context) return prefs.getBoolean(context.getString(R.string.lock_database_screen_off_key), @@ -237,18 +244,24 @@ object PreferencesUtil { context.resources.getBoolean(R.bool.biometric_unlock_enable_default)) } - fun isAdvancedUnlockPromptAutoOpenEnable(context: Context): Boolean { - val prefs = PreferenceManager.getDefaultSharedPreferences(context) - return prefs.getBoolean(context.getString(R.string.biometric_auto_open_prompt_key), - context.resources.getBoolean(R.bool.biometric_auto_open_prompt_default)) - } - fun isDeviceCredentialUnlockEnable(context: Context): Boolean { val prefs = PreferenceManager.getDefaultSharedPreferences(context) return prefs.getBoolean(context.getString(R.string.device_credential_unlock_enable_key), context.resources.getBoolean(R.bool.device_credential_unlock_enable_default)) } + fun isTempAdvancedUnlockEnable(context: Context): Boolean { + val prefs = PreferenceManager.getDefaultSharedPreferences(context) + return prefs.getBoolean(context.getString(R.string.temp_advanced_unlock_enable_key), + context.resources.getBoolean(R.bool.temp_advanced_unlock_enable_default)) + } + + fun isAdvancedUnlockPromptAutoOpenEnable(context: Context): Boolean { + val prefs = PreferenceManager.getDefaultSharedPreferences(context) + return prefs.getBoolean(context.getString(R.string.biometric_auto_open_prompt_key), + context.resources.getBoolean(R.bool.biometric_auto_open_prompt_default)) + } + fun getListSort(context: Context): SortNodeEnum { val prefs = PreferenceManager.getDefaultSharedPreferences(context) prefs.getString(context.getString(R.string.sort_node_key), diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index bfa602c58..380a88632 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -94,11 +94,15 @@ advanced_unlock_explanation_key biometric_unlock_enable_key false - biometric_auto_open_prompt_key - false - biometric_delete_all_key_key device_credential_unlock_enable_key false + biometric_auto_open_prompt_key + false + temp_advanced_unlock_enable_key + false + temp_advanced_unlock_timeout_key + 30000 + biometric_delete_all_key_key settings_form_filling_key diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a474b00e..22b45485b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -317,6 +317,7 @@ Lock the database when the user clicks the back button on the root screen Show lock button Displays the lock button in the user interface + Content Advanced unlock Use advanced unlocking to open a database more easily Biometric unlocking @@ -325,6 +326,11 @@ Lets you use your device credential to open the database Auto-open prompt Automatically request advanced unlock if the database is set up to use it + Temp advanced unlocking + Do not store any encrypted content to use advanced unlocking + Advanced unlocking expiration + Duration of advanced unlocking usage before deleting its content + Advanced unlocking timeout Delete encryption keys Delete all encryption keys related to advanced unlock recognition Delete all encryption keys related to advanced unlock recognition? diff --git a/app/src/main/res/xml/preferences_advanced_unlock.xml b/app/src/main/res/xml/preferences_advanced_unlock.xml index 9ce2402fd..4bef7680f 100644 --- a/app/src/main/res/xml/preferences_advanced_unlock.xml +++ b/app/src/main/res/xml/preferences_advanced_unlock.xml @@ -39,6 +39,23 @@ android:title="@string/biometric_auto_open_prompt_title" android:summary="@string/biometric_auto_open_prompt_summary" android:defaultValue="@bool/biometric_auto_open_prompt_default"/> + + + +