diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-22 18:24:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-22 18:24:12 +0200 |
| commit | bf10eb91b72c18398783685b6445d2b1580dc922 (patch) | |
| tree | 9ee5a5be506f183798166fb6690eb159ca1f08fa /OpenKeychain/src/main/res | |
| parent | e4e8bc5e0768a0d3390d28ee087ac48d934d359f (diff) | |
| download | open-keychain-bf10eb91b72c18398783685b6445d2b1580dc922.tar.gz open-keychain-bf10eb91b72c18398783685b6445d2b1580dc922.tar.bz2 open-keychain-bf10eb91b72c18398783685b6445d2b1580dc922.zip | |
Remove support for V3 signatures
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/adv_preferences.xml | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 55ecf3ae0..87b2a83be 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -122,7 +122,6 @@ <string name="label_passphrase_cache_ttl">Passphrase Cache</string> <string name="label_message_compression">Message Compression</string> <string name="label_file_compression">File Compression</string> - <string name="label_force_v3_signature">Force old OpenPGPv3 Signatures</string> <string name="label_keyservers">Keyservers</string> <string name="label_key_id">Key ID</string> <string name="label_creation">Creation</string> diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml index a07ae06bb..0426ca298 100644 --- a/OpenKeychain/src/main/res/xml/adv_preferences.xml +++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml @@ -16,7 +16,7 @@ --> <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:key="defaultEncryptionAlgorithm" android:persistent="false" @@ -33,22 +33,16 @@ android:key="defaultFileCompression" android:persistent="false" android:title="@string/label_file_compression" /> - <CheckBoxPreference android:key="defaultAsciiArmor" android:persistent="false" android:title="@string/label_ascii_armor" /> - + </PreferenceCategory> + <PreferenceCategory android:title="@string/section_advanced"> <CheckBoxPreference android:key="concealPgpApplication" android:persistent="false" android:title="@string/label_conceal_pgp_application" android:summary="@string/label_conceal_pgp_application_summary" /> </PreferenceCategory> - <PreferenceCategory android:title="@string/section_advanced" > - <CheckBoxPreference - android:key="forceV3Signatures" - android:persistent="false" - android:title="@string/label_force_v3_signature"/> - </PreferenceCategory> </PreferenceScreen> |