mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-24 07:58:50 -05:00
Merge branch 'development' of github.com:open-keychain/open-keychain into development
This commit is contained in:
commit
c7e2b8424e
@ -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 -->
|
||||
|
@ -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>
|
||||
|
@ -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">
|
||||
<CheckBoxPreference
|
||||
android:key="writeVersionHeader"
|
||||
<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_write_version_header"
|
||||
android:summary="@string/label_write_version_header_summary" />
|
||||
android:title="@string/label_passphrase_cache_ttl" />
|
||||
<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>
|
||||
<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>
|
||||
|
Loading…
Reference in New Issue
Block a user