diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-05 16:57:57 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-05 16:57:57 +0100 |
commit | e45f000cb458e8608ad851ce7ecca0045e5ac6b0 (patch) | |
tree | e6208f512239ad32fd9123c19781a1a3b3e70c58 /OpenKeychain/src/main/res | |
parent | 8b7684baf78b01592777a1ccb29293a4b59bdf14 (diff) | |
download | open-keychain-e45f000cb458e8608ad851ce7ecca0045e5ac6b0.tar.gz open-keychain-e45f000cb458e8608ad851ce7ecca0045e5ac6b0.tar.bz2 open-keychain-e45f000cb458e8608ad851ce7ecca0045e5ac6b0.zip |
Remove advanced preferences, move compression as menu item in encrypt activites, select hash and encryption algo based on hardcoded preferred lists
Diffstat (limited to 'OpenKeychain/src/main/res')
5 files changed, 33 insertions, 51 deletions
diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml index fd0a85d6c..9a26d1757 100644 --- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml +++ b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml @@ -12,4 +12,9 @@ android:id="@+id/check_delete_after_encrypt" android:title="@string/label_delete_after_encryption" android:checkable="true" /> + <item + android:id="@+id/check_enable_compression" + android:title="@string/label_enable_compression" + android:checked="true" + android:checkable="true" /> </menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml index 8deb59514..71d254bb9 100644 --- a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml @@ -4,4 +4,9 @@ android:id="@+id/check_use_symmetric" android:title="@string/label_symmetric" android:checkable="true" /> + <item + android:id="@+id/check_enable_compression" + android:title="@string/label_enable_compression" + android:checked="true" + android:checkable="true" /> </menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 207553620..147201bc4 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -161,6 +161,7 @@ <string name="expiry_date_dialog_title">"Set expiry date"</string> <string name="label_first_keyserver_is_used">"(First keyserver listed is preferred)"</string> <string name="label_preferred">"preferred"</string> + <string name="label_enable_compression">"Enable compression"</string> <string name="user_id_no_name">"<no name>"</string> <string name="none">"<none>"</string> diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml index 02986bdad..7dd649e5d 100644 --- a/OpenKeychain/src/main/res/xml/adv_preferences.xml +++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml @@ -1,52 +1,23 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <PreferenceCategory android:title="@string/section_defaults"> - <CheckBoxPreference - android:key="writeVersionHeader" - android:persistent="false" - 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" - android:title="@string/label_encryption_algorithm" /> - <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference - android:key="defaultHashAlgorithm" - android:persistent="false" - android:title="@string/label_hash_algorithm" /> - <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference - android:key="defaultMessageCompression" - android:persistent="false" - android:title="@string/label_message_compression" /> - <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference - 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_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="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> + <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: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" /> </PreferenceScreen> diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index 347394b06..e3447ff48 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -4,5 +4,5 @@ android:title="@string/section_cloud_search" /> <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$AdvancedPrefsFragment" - android:title="@string/section_advanced" /> + android:title="@string/section_passphrase_cache" /> </preference-headers> |