From 723a40a216fbb9530317ec377db3ce1b042623f4 Mon Sep 17 00:00:00 2001 From: reroman Date: Sun, 13 Jan 2019 17:13:11 -0600 Subject: Clipboard now is cleared with manual copy (#464) * Clipboard now is cleared after manual copy * Spanish translation added * Spanish translations for commit messages updated * Validation of value 0 in general_show_time before start timer The clear_after_copy preference is disabled according with that value. * Like clear_after_copy, clear_clipboard_20x now depends on the value of general_show_time too --- app/src/main/java/com/zeapo/pwdstore/UserPreference.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'app/src/main/java/com/zeapo/pwdstore/UserPreference.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt index afac816a..7d1be72c 100644 --- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt +++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt @@ -168,6 +168,16 @@ class UserPreference : AppCompatActivity() { callingActivity.exportPasswordsWithPermissions() true } + + findPreference("general_show_time").onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _: Preference?, newValue: Any? -> + try { + findPreference("clear_after_copy").isEnabled = newValue.toString().toInt() != 0 + findPreference("clear_clipboard_20x").isEnabled = newValue.toString().toInt() != 0 + true + } catch (e: NumberFormatException) { + false + } + } } override fun onStart() { @@ -183,6 +193,8 @@ class UserPreference : AppCompatActivity() { )?.isNotEmpty() ?: false findPreference("hotp_remember_clear_choice").isEnabled = sharedPreferences.getBoolean("hotp_remember_check", false) + findPreference("clear_after_copy").isEnabled = sharedPreferences.getString("general_show_time", "45")?.toInt() != 0 + findPreference("clear_clipboard_20x").isEnabled = sharedPreferences.getString("general_show_time", "45")?.toInt() != 0 val keyPref = findPreference("openpgp_key_id_pref") val selectedKeys: Array = ArrayList( sharedPreferences.getStringSet( -- cgit v1.2.3