moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-26 00:48:51 -05:00
Code Issues Releases Wiki Activity

Group passphrase cache settings

Browse Source
This commit is contained in:
Dominik Schürmann 2014-10-13 19:34:41 +02:00
parent 85d4bcca52
commit dc87557805
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/res/values/strings.xml
View File

@ -47,6 +47,7 @@
<string name="section_general">"General"</string> <string name="section_general">"General"</string>
<string name="section_defaults">"Defaults"</string> <string name="section_defaults">"Defaults"</string>
<string name="section_advanced">"Advanced"</string> <string name="section_advanced">"Advanced"</string>
<string name="section_passphrase_cache">"Passphrase Cache"</string>
<string name="section_certify">"Certify"</string> <string name="section_certify">"Certify"</string>
<string name="section_actions">"Actions"</string> <string name="section_actions">"Actions"</string>
<string name="section_share_key">"Key"</string> <string name="section_share_key">"Key"</string>
@ -121,7 +122,7 @@
<string name="label_encryption_algorithm">"Encryption algorithm"</string> <string name="label_encryption_algorithm">"Encryption algorithm"</string>
<string name="label_hash_algorithm">"Hash algorithm"</string> <string name="label_hash_algorithm">"Hash algorithm"</string>
<string name="label_symmetric">"Encrypt with passphrase"</string> <string name="label_symmetric">"Encrypt with passphrase"</string>
<string name="label_passphrase_cache_ttl">"Passphrase cache"</string> <string name="label_passphrase_cache_ttl">"Cache time"</string>
<string name="label_passphrase_cache_subs">"Cache passphrases by subkey"</string> <string name="label_passphrase_cache_subs">"Cache passphrases by subkey"</string>
<string name="label_message_compression">"Message compression"</string> <string name="label_message_compression">"Message compression"</string>
<string name="label_file_compression">"File compression"</string> <string name="label_file_compression">"File compression"</string>

48
OpenKeychain/src/main/res/xml/adv_preferences.xml
View File

@ -1,15 +1,10 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/section_defaults"> <PreferenceCategory android:title="@string/section_defaults">
<org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
android:entries="@array/passphrase_cache_ttl_entries"
android:entryValues="@array/passphrase_cache_ttl_values"
android:key="passphraseCacheTtl"
android:persistent="false"
android:title="@string/label_passphrase_cache_ttl" />
<CheckBoxPreference <CheckBoxPreference
android:key="passphraseCacheSubs" android:key="writeVersionHeader"
android:persistent="false" android:persistent="false"
android:title="@string/label_passphrase_cache_subs" /> android:title="@string/label_write_version_header"
android:summary="@string/label_write_version_header_summary" />
<org.sufficientlysecure.keychain.ui.widget.IntegerListPreference <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
android:key="defaultEncryptionAlgorithm" android:key="defaultEncryptionAlgorithm"
android:persistent="false" android:persistent="false"
@ -31,22 +26,27 @@
android:persistent="false" android:persistent="false"
android:title="@string/label_ascii_armor" /> android:title="@string/label_ascii_armor" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/section_advanced"> <PreferenceCategory android:title="@string/section_passphrase_cache">
<CheckBoxPreference <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
android:key="writeVersionHeader" android:entries="@array/passphrase_cache_ttl_entries"
android:entryValues="@array/passphrase_cache_ttl_values"
android:key="passphraseCacheTtl"
android:persistent="false" android:persistent="false"
android:title="@string/label_write_version_header" android:title="@string/label_passphrase_cache_ttl" />
android:summary="@string/label_write_version_header_summary" /> <CheckBoxPreference
android:key="passphraseCacheSubs"
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:key="useNumKeypadForYubikeyPin"
android:persistent="false"
android:defaultValue="false"
android:title="@string/label_use_num_keypad_for_yubikey_pin" />
</PreferenceCategory> </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" />
<CheckBoxPreference
android:key="useNumKeypadForYubikeyPin"
android:persistent="false"
android:defaultValue="false"
android:title="@string/label_use_num_keypad_for_yubikey_pin" />
</PreferenceScreen> </PreferenceScreen>