diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-16 13:43:21 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-16 13:43:21 +0200 |
commit | 4f2e02d6064202689eab0201b2bf06a6c842472d (patch) | |
tree | aa0ecfb0872eb145506f39452c840b190b4ae8f6 /OpenKeychain/src/main/res | |
parent | a83f260cdbe28a0f5ad1094b3c3ebd8044834aa9 (diff) | |
download | open-keychain-4f2e02d6064202689eab0201b2bf06a6c842472d.tar.gz open-keychain-4f2e02d6064202689eab0201b2bf06a6c842472d.tar.bz2 open-keychain-4f2e02d6064202689eab0201b2bf06a6c842472d.zip |
Remove default PIN setting
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/xml/passphrase_preferences.xml | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 15e714a11..11036c9d3 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -141,9 +141,7 @@ <string name="label_file_ascii_armor">"Enable 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_use_num_keypad_for_yubikey_pin">Use number keypad for 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">"Sign with:"</string> <string name="label_to">"Encrypt to:"</string> <string name="label_delete_after_encryption">"Delete files after encryption"</string> @@ -1537,7 +1535,6 @@ <string name="error_nfc_tag_lost">"YubiKey has been taken off too early. Keep the YubiKey at the back until the operation finishes."</string> <string name="error_nfc_iso_dep_not_supported">"Tag does not support ISO-DEP (ISO 14443-4)"</string> <string name="error_nfc_try_again">"Try again"</string> - <string name="error_pin_nodefault">Default PIN was rejected!</string> <string name="error_pin_wrong">PIN is wrong!</string> <string name="error_temp_file">Error creating temporary file.</string> <string name="btn_delete_original">Delete original file</string> diff --git a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml index 7dd649e5d..86de8a4b7 100644 --- a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml +++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml @@ -10,14 +10,8 @@ android:persistent="false" android:title="@string/label_passphrase_cache_subs" /> <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" /> - <CheckBoxPreference + android:defaultValue="false" android:key="useNumKeypadForYubikeyPin" android:persistent="false" - android:defaultValue="false" android:title="@string/label_use_num_keypad_for_yubikey_pin" /> </PreferenceScreen> |