diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-10-22 00:19:44 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-10-22 00:19:44 +0200 |
commit | 01bfe0c59a5bc3eba1db111d3bc687aac9be7847 (patch) | |
tree | e7d6d63eeed8514b9f3992dd09e1abd84932e9a5 /src/main/java/eu/siacs/conversations/xmpp | |
parent | 0a5a985cbe582e6f7ece37ec257fe53ccee4bb42 (diff) | |
parent | 85a25984f4bf4dfa2432fbc2c92f8117cf927fcf (diff) |
Merge trz/rename into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 35c89b45..1211c38f 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -1,13 +1,11 @@ package eu.siacs.conversations.xmpp; import android.content.Context; -import android.content.SharedPreferences; import android.os.Bundle; import android.os.Parcelable; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.os.SystemClock; -import android.preference.PreferenceManager; import android.util.Log; import android.util.Pair; import android.util.SparseArray; @@ -26,7 +24,6 @@ import java.net.IDN; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; -import java.net.SocketAddress; import java.net.UnknownHostException; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; @@ -521,14 +518,6 @@ public class XmppConnection implements Runnable { tagWriter.writeTag(startTLS); } - private SharedPreferences getPreferences() { - return PreferenceManager.getDefaultSharedPreferences(applicationContext); - } - - private boolean enableLegacySSL() { - return getPreferences().getBoolean("enable_legacy_ssl", false); - } - private void switchOverToTls(final Tag currentTag) throws XmlPullParserException, IOException { tagReader.readTag(); try { |