From 66aa8520b8359d1718f70c3e16a5f745b2843120 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 10 May 2017 21:05:27 +0200 Subject: do not synchronize startXmpp() and sendPacket() on the same object as this can block the ui --- src/main/java/de/pixart/messenger/xmpp/XmppConnection.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/pixart/messenger/xmpp/XmppConnection.java') diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java index 28dddd961..64fb6918b 100644 --- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java @@ -472,7 +472,7 @@ public class XmppConnection implements Runnable { * * @return true if server returns with valid xmpp, false otherwise */ - private synchronized boolean startXmpp(Socket socket) throws Exception { + private boolean startXmpp(Socket socket) throws Exception { if (Thread.currentThread().isInterrupted()) { throw new InterruptedException(); } @@ -674,9 +674,7 @@ public class XmppConnection implements Runnable { Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": resumption failed"); } resetStreamId(); - if (account.getStatus() != Account.State.ONLINE) { - sendBindRequest(); - } + sendBindRequest(); } else if (nextTag.isStart("iq")) { processIq(nextTag); } else if (nextTag.isStart("message")) { -- cgit v1.2.3