diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-05 19:40:04 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-05 19:40:04 +0200 |
commit | fa9bbdd60cecb2697ae8c331a8e46d61c99d2703 (patch) | |
tree | 1c22ce857049330f567af6e73811cfd554a7e3ee /OpenKeychain/src/main/res | |
parent | 2a9b08301239f0709cbe338122d7bde6c2768d0c (diff) | |
download | open-keychain-fa9bbdd60cecb2697ae8c331a8e46d61c99d2703.tar.gz open-keychain-fa9bbdd60cecb2697ae8c331a8e46d61c99d2703.tar.bz2 open-keychain-fa9bbdd60cecb2697ae8c331a8e46d61c99d2703.zip |
Add yubikey default PIN preference
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/xml/adv_preferences.xml | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 944e3b835..b666a198c 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -93,6 +93,8 @@ <string name="label_file_ascii_armor">Files: ASCII Armor</string> <string name="label_write_version_header">Let others know that you\'re using OpenKeychain</string> <string name="label_write_version_header_summary">Writes \'OpenKeychain v2.7\' to OpenPGP signatures, ciphertext, and exported keys</string> + <string name="label_use_default_yubikey_pin">Use default Yubikey PIN</string> + <string name="label_label_use_default_yubikey_pin_summary">Uses default PIN (123456) to access Yubikeys over NFC</string> <string name="label_asymmetric_from">Signed by:</string> <string name="label_to">Encrypt to:</string> <string name="label_delete_after_encryption">Files: Delete After Encryption</string> diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml index 02fa4ec40..3180f21aa 100644 --- a/OpenKeychain/src/main/res/xml/adv_preferences.xml +++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml @@ -28,4 +28,11 @@ android:title="@string/label_write_version_header" android:summary="@string/label_write_version_header_summary" /> </PreferenceCategory> + <CheckBoxPreference + android:key="useDefaultYubikeyPin" + android:persistent="false" + android:defaultValue="true" + android:title="@string/label_use_default_yubikey_pin" + android:summary="@string/label_label_use_default_yubikey_pin_summary" /> + </PreferenceScreen> |