diff options
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 24 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/adv_preferences.xml | 46 |
3 files changed, 43 insertions, 30 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index a07325a39..f1bfbd9b0 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -240,8 +240,17 @@ <category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.DEFAULT" /> - <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 --> + <!-- preferred MIME type for encrypted data (non-standard right now) --> + <data android:mimeType="application/pgp-message" /> + + <!-- + MIME type as defined in http://tools.ietf.org/html/rfc3156, but too generic + NOTE: application/pgp-encrypted is not registered here, because it does not contain the actual data + application/pgp-signature is not registered here, it only contains a detached signature, which is useless without the message + --> <data android:mimeType="application/octet-stream" /> + + <!-- non-standard MIME types found in the wild --> <data android:mimeType="application/pgp" /> <data android:mimeType="text/pgp" /> </intent-filter> @@ -460,10 +469,13 @@ <category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.DEFAULT" /> - <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 --> + <!-- preferred MIME type as defined in http://tools.ietf.org/html/rfc3156 --> <data android:mimeType="application/pgp-keys" /> - <!-- also link to text/plain, AOSP mail and K-9 mail only give mimeType text/plain - when the key file has been manually attached --> + + <!-- + also link to text/plain, AOSP mail and K-9 mail only give mimeType text/plain + when the key file has been manually attached + --> <data android:mimeType="text/plain" /> </intent-filter> <!-- NFC: Handle NFC tags detected from outside our application --> @@ -471,7 +483,7 @@ <action android:name="android.nfc.action.NDEF_DISCOVERED" /> <category android:name="android.intent.category.DEFAULT" /> - <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 --> + <!-- MIME type as defined in http://tools.ietf.org/html/rfc3156 --> <data android:mimeType="application/pgp-keys" /> </intent-filter> <!-- VIEW with file endings: *.gpg (e.g. to import from OI File Manager) --> @@ -607,7 +619,7 @@ <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" /> <category android:name="android.intent.category.DEFAULT" /> - <!-- mime type as defined in http://tools.ietf.org/html/rfc3156, section 7 --> + <!-- MIME type as defined in http://tools.ietf.org/html/rfc3156, section 7 --> <data android:mimeType="application/pgp-keys" /> </intent-filter> <!-- IMPORT_KEY without mimeType to allow import with extras Bundle --> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index d94f9e800..d32787c9b 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -47,6 +47,7 @@ <string name="section_general">"General"</string> <string name="section_defaults">"Defaults"</string> <string name="section_advanced">"Advanced"</string> + <string name="section_passphrase_cache">"Passphrase Cache"</string> <string name="section_certify">"Certify"</string> <string name="section_actions">"Actions"</string> <string name="section_share_key">"Key"</string> @@ -121,7 +122,7 @@ <string name="label_encryption_algorithm">"Encryption algorithm"</string> <string name="label_hash_algorithm">"Hash algorithm"</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_message_compression">"Message compression"</string> <string name="label_file_compression">"File compression"</string> diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml index fcca59abe..02986bdad 100644 --- a/OpenKeychain/src/main/res/xml/adv_preferences.xml +++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml @@ -1,15 +1,10 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <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 - android:key="passphraseCacheSubs" + android:key="writeVersionHeader" 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 android:key="defaultEncryptionAlgorithm" android:persistent="false" @@ -31,22 +26,27 @@ android:persistent="false" android:title="@string/label_ascii_armor" /> </PreferenceCategory> - <PreferenceCategory android:title="@string/section_advanced"> + <PreferenceCategory android:title="@string/section_passphrase_cache"> + <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 - android:key="writeVersionHeader" + android:key="passphraseCacheSubs" android:persistent="false" - android:title="@string/label_write_version_header" - android:summary="@string/label_write_version_header_summary" /> + 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> - <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> |