From 2f1f111262b011f64cf2ff8df1cc5d37eb0a75ce Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 26 Apr 2017 20:10:12 +0200 Subject: make sure tag writer thread shuts down --- src/main/java/de/pixart/messenger/xmpp/XmppConnection.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart/messenger/xmpp') diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java index d3132961f..3d7961980 100644 --- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java @@ -228,7 +228,8 @@ public class XmppConnection implements Runnable { protected synchronized void changeStatus(final Account.State nextStatus) { if (Thread.currentThread().isInterrupted()) { - Log.d(Config.LOGTAG,account.getJid().toBareJid()+": not changing status to "+nextStatus+" because thread was interrupted"); + Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": not changing status to " + nextStatus + " because thread was interrupted"); + return; } if (account.getStatus() != nextStatus) { if ((nextStatus == Account.State.OFFLINE) @@ -485,7 +486,7 @@ public class XmppConnection implements Runnable { * * @return true if server returns with valid xmpp, false otherwise */ - private boolean startXmpp(Socket socket) throws Exception { + private synchronized boolean startXmpp(Socket socket) throws Exception { if (Thread.currentThread().isInterrupted()) { throw new InterruptedException(); } -- cgit v1.2.3