From 6c7c3ddf15aebaedbd4c62e7771bb7e378ebf4ad Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 19 Oct 2014 15:53:03 -0400
Subject: Add "Enable legacy SSL" preference

---
 res/values/strings.xml  | 6 ++++--
 res/xml/preferences.xml | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'res')

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>
-- 
cgit v1.2.3


From 99ee049115587b8d914d2df707d8bf152fdd42f6 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 19 Oct 2014 16:11:35 -0400
Subject: Make legacy SSL option default to false

---
 res/xml/preferences.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 7a61b81f..e4a527f6 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -89,7 +89,7 @@
                     android:summary="@string/pref_dont_save_encrypted_summary"
                     android:title="@string/pref_dont_save_encrypted" />
                 <CheckBoxPreference
-                    android:defaultValue="true"
+                    android:defaultValue="false"
                     android:key="enable_legacy_ssl"
                     android:summary="@string/pref_enable_legacy_ssl_summary"
                     android:title="@string/pref_enable_legacy_ssl" />
-- 
cgit v1.2.3