aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
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
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 'src/main/res')
-rw-r--r--src/main/res/values-de/strings.xml11
-rw-r--r--src/main/res/values/strings.xml11
-rw-r--r--src/main/res/xml/preferences.xml16
3 files changed, 33 insertions, 5 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index addc55de..d5f550a3 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -429,8 +429,19 @@
<string name="received_location">Standort empfangen</string>
<string name="title_undo_swipe_out_conversation">Unterhaltung beendet</string>
<string name="title_undo_swipe_out_muc">Konferenz verlassen</string>
+ <string name="pref_certificate_options">Zertifikats-Optionen</string>
<string name="pref_dont_trust_system_cas_title">Misstraue Zertifizierungsstellen</string>
<string name="pref_dont_trust_system_cas_summary">Alle Zertifikate müssen manuell bestätigt werden</string>
+ <string name="pref_remove_trusted_certificates_title">Zertifikate löschen</string>
+ <string name="pref_remove_trusted_certificates_summary">Als vertrauenswürdig bestätigte Zertifikate löschen</string>
+ <string name="toast_no_trusted_certs">Keine manuell bestätigten Zertifikate</string>
+ <string name="dialog_manage_certs_title">Zertifikate löschen</string>
+ <string name="dialog_manage_certs_positivebutton">Auswahl löschen</string>
+ <string name="dialog_manage_certs_negativebutton">Abbrechen</string>
+ <plurals name="toast_delete_certificates">
+ <item quantity="one">%d Zertifikat gelöscht</item>
+ <item quantity="other">%d Zertifikate gelöscht</item>
+ </plurals>
<plurals name="select_contact">
<item quantity="one">%d Kontakt ausgewählt</item>
<item quantity="other">%d Kontakte ausgewählt</item>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4a36163c..cc7727d2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -457,8 +457,19 @@
<string name="received_location">Received location</string>
<string name="title_undo_swipe_out_conversation">Conversation closed</string>
<string name="title_undo_swipe_out_muc">Left conference</string>
+ <string name="pref_certificate_options">Certificate options</string>
<string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string>
<string name="pref_dont_trust_system_cas_summary">All certificates must be manually approved</string>
+ <string name="pref_remove_trusted_certificates_title">Remove certificates</string>
+ <string name="pref_remove_trusted_certificates_summary">Delete manually approved certificates</string>
+ <string name="toast_no_trusted_certs">No manually approved certificates</string>
+ <string name="dialog_manage_certs_title">Remove certificates</string>
+ <string name="dialog_manage_certs_positivebutton">Delete selection</string>
+ <string name="dialog_manage_certs_negativebutton">Cancel</string>
+ <plurals name="toast_delete_certificates">
+ <item quantity="one">%d certificate deleted</item>
+ <item quantity="other">%d certificates deleted</item>
+ </plurals>
<plurals name="select_contact">
<item quantity="one">Select %d contact</item>
<item quantity="other">Select %d contacts</item>
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>