code cleanup

2 files changed, 5 insertions, 6 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();
diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml
index e9350addd..a04ce6763 100644
--- a/src/main/res/values-w384dp/dimens.xml
+++ b/src/main/res/values-w384dp/dimens.xml
@@ -2,7 +2,6 @@
     <!-- 384dp is the screen width of the Nexus 4. Something like a Moto G is smaller but a Nexus 5X is larger -->
     <!-- https://material.io/devices/ -->
     <dimen name="fineprint_size">12sp</dimen>
-    <dimen name="swipe_handle_size">48dp</dimen>
     <dimen name="audio_player_width">288dp</dimen>
     <dimen name="avatar_on_details_screen_size">72dp</dimen>
     <dimen name="media_size">64dp</dimen> <!-- ideally not larger than avatar_on_details_screen -->