aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-10-19 15:53:03 -0400
committerSam Whited <sam@samwhited.com>2014-10-19 15:53:03 -0400
commit6c7c3ddf15aebaedbd4c62e7771bb7e378ebf4ad (patch)
tree9b1e6703087391ec44ae705487fe2c82725c1739 /res
parent113b7d17361a7da7ae08b0845011070e0c005fc5 (diff)
Add "Enable legacy SSL" preference
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml6
-rw-r--r--res/xml/preferences.xml7
2 files changed, 10 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 18eec00a..4351c118 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -249,8 +249,10 @@
<string name="pref_force_encryption">Force end-to-end encryption</string>
<string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
- <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
- <string name="pref_expert_options">Expert options</string>
+ <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
+ <string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
+ <string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string>
+ <string name="pref_expert_options">Expert options</string>
<string name="pref_expert_options_summary">Please be very careful with those</string>
<string name="pref_use_larger_font">Increase font size</string>
<string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index eccc8bae..7a61b81f 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -88,6 +88,11 @@
android:key="dont_save_encrypted"
android:summary="@string/pref_dont_save_encrypted_summary"
android:title="@string/pref_dont_save_encrypted" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="enable_legacy_ssl"
+ android:summary="@string/pref_enable_legacy_ssl_summary"
+ android:title="@string/pref_enable_legacy_ssl" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_expert_options_other" >
<CheckBoxPreference
@@ -105,4 +110,4 @@
android:title="@string/pref_never_send_crash" />
</PreferenceCategory>
-</PreferenceScreen> \ No newline at end of file
+</PreferenceScreen>