aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-10-01 14:30:44 +0200
committerChristian Schneppe <christian@pix-art.de>2018-10-01 14:30:44 +0200
commit1a7690aa0a46cc0d82ea706f6877d1642a7ee120 (patch)
treec79a035a4130c87c5b31975e64fc05a3f8eafa34 /src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
parentca9bc796558d86689ddb999f84cafb78781798fb (diff)
code cleanup
Diffstat (limited to 'src/main/java/de/pixart/messenger/xmpp/XmppConnection.java')
-rw-r--r--src/main/java/de/pixart/messenger/xmpp/XmppConnection.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
index 35b0dde93..ee5f91e2f 100644
--- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
@@ -210,7 +210,7 @@ public class XmppConnection implements Runnable {
}
}
- protected void changeStatus(final Account.State nextStatus) {
+ private void changeStatus(final Account.State nextStatus) {
synchronized (this) {
if (Thread.currentThread().isInterrupted()) {
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": not changing status to " + nextStatus + " because thread was interrupted");
@@ -403,8 +403,8 @@ public class XmppConnection implements Runnable {
}
SSLSocketHelper.setSecurity((SSLSocket) localSocket);
- SSLSocketHelper.setSNIHost((SSLSocket) localSocket, account.getServer());
- SSLSocketHelper.setAlpnProtocol((SSLSocket) localSocket, "xmpp-client");
+ SSLSocketHelper.setHostname((SSLSocket) localSocket, account.getServer());
+ SSLSocketHelper.setApplicationProtocol((SSLSocket) localSocket, "xmpp-client");
localSocket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
@@ -527,7 +527,7 @@ public class XmppConnection implements Runnable {
} else if (nextTag.isStart("features")) {
processStreamFeatures(nextTag);
} else if (nextTag.isStart("proceed")) {
- switchOverToTls(nextTag);
+ switchOverToTls();
} else if (nextTag.isStart("success")) {
final String challenge = tagReader.readElement(nextTag).getContent();
try {
@@ -855,7 +855,7 @@ public class XmppConnection implements Runnable {
tagWriter.writeTag(startTLS);
}
- private void switchOverToTls(final Tag currentTag) throws XmlPullParserException, IOException {
+ private void switchOverToTls() throws XmlPullParserException, IOException {
tagReader.readTag();
try {
final TlsFactoryVerifier tlsFactoryVerifier = getTlsFactoryVerifier();