diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-23 23:04:27 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-23 23:04:27 +0200 |
commit | b9347ea9aa6a74f385c149fbbb977c270cb91454 (patch) | |
tree | 86c72e9113b711cf548cc4f1291ca10f2d367150 /OpenKeychain/src/main/java | |
parent | 9f67b0fe54ed4045f8db2d377b90d15473a19912 (diff) | |
parent | ab4972b4282ec88948b98595de0a4020548996c4 (diff) | |
download | open-keychain-b9347ea9aa6a74f385c149fbbb977c270cb91454.tar.gz open-keychain-b9347ea9aa6a74f385c149fbbb977c270cb91454.tar.bz2 open-keychain-b9347ea9aa6a74f385c149fbbb977c270cb91454.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java index 3ffc182fb..9d3175d15 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java @@ -82,6 +82,9 @@ public class PreferencesActivity extends PreferenceActivity { } else if (action != null && action.equals(ACTION_PREFS_ADV)) { addPreferencesFromResource(R.xml.adv_preferences); + initializePassphraseCacheSubs( + (CheckBoxPreference) findPreference(Constants.Pref.PASSPHRASE_CACHE_SUBS)); + initializePassphraseCacheTtl( (IntegerListPreference) findPreference(Constants.Pref.PASSPHRASE_CACHE_TTL)); |