aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-10-19 16:11:35 -0400
committerSam Whited <sam@samwhited.com>2014-10-19 16:11:35 -0400
commit99ee049115587b8d914d2df707d8bf152fdd42f6 (patch)
treefd29351053555d005b0f7f5ce6d2da2f1e8e280c
parent6c7c3ddf15aebaedbd4c62e7771bb7e378ebf4ad (diff)
Make legacy SSL option default to false
-rw-r--r--res/xml/preferences.xml2
-rw-r--r--src/eu/siacs/conversations/xmpp/XmppConnection.java2
2 files changed, 2 insertions, 2 deletions
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" />
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index 43469f08..0ae51fb5 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -517,7 +517,7 @@ public class XmppConnection implements Runnable {
}
private boolean enableLegacySSL() {
- return getPreferences().getBoolean("enable_legacy_ssl", true);
+ return getPreferences().getBoolean("enable_legacy_ssl", false);
}
private void switchOverToTls(Tag currentTag) throws XmlPullParserException,