aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml
diff options
context:
space:
mode:
authorBrianBlade <n.gelbertz@gmail.com>2015-04-19 18:08:13 +0200
committerBrianBlade <n.gelbertz@gmail.com>2015-04-19 18:08:13 +0200
commitda367dd752b6c92a3d0dbc558c80ebc71ef7b1fe (patch)
tree23a555bd362def09286c3c3d799356cb60b7ae86 /src/main/res/xml
parent570a22206dd1588ac2bff0e950a48befa0daef82 (diff)
Add option to remove manually approved certificates
- "Remove certificates" option brings up a dialog that allows to delete certificates from MemorizingTrustManager's keystore - Reconnect active accounts when certificate-settings are changed - new preference category "Certificate options"
Diffstat (limited to '')
-rw-r--r--src/main/res/xml/preferences.xml16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 9cf0100f..417e60a4 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -142,6 +142,17 @@
android:title="@string/pref_display_enter_key"
android:summary="@string/pref_display_enter_key_summary" />
</PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_certificate_options">
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="dont_trust_system_cas"
+ android:title="@string/pref_dont_trust_system_cas_title"
+ android:summary="@string/pref_dont_trust_system_cas_summary" />
+ <Preference
+ android:key="remove_trusted_certificates"
+ android:title="@string/pref_remove_trusted_certificates_title"
+ android:summary="@string/pref_remove_trusted_certificates_summary" />
+ </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_expert_options_other" >
<CheckBoxPreference
android:defaultValue="false"
@@ -153,11 +164,6 @@
android:key="keep_foreground_service"
android:title="@string/pref_keep_foreground_service"
android:summary="@string/pref_keep_foreground_service_summary" />
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="dont_trust_system_cas"
- android:title="@string/pref_dont_trust_system_cas_title"
- android:summary="@string/pref_dont_trust_system_cas_summary" />
</PreferenceCategory>
</PreferenceScreen>