From 2014f388b1f5eef66c8f787dc6889b03ae461d08 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 12 May 2016 21:54:42 +0200 Subject: interrupt XMPPConnection Thread in some cases the the DNS query might take too long (even though we specified a timeout) if that happens we need a secondary solution (besides killing the socket) to stop the thread --- src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/main/java/eu/siacs/conversations/xmpp') diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 823fa0ce..3740097e 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -280,6 +280,10 @@ public class XmppConnection implements Runnable { final Bundle result = DNSHelper.getSRVRecord(account.getServer(), mXmppConnectionService); final ArrayListvalues = result.getParcelableArrayList("values"); for(Iterator iterator = values.iterator(); iterator.hasNext();) { + if (Thread.currentThread().isInterrupted()) { + Log.d(Config.LOGTAG,account.getJid().toBareJid()+": Thread was interrupted"); + return; + } final Bundle namePort = (Bundle) iterator.next(); try { String srvRecordServer; @@ -1334,7 +1338,12 @@ public class XmppConnection implements Runnable { } } + public void interrupt() { + Thread.currentThread().interrupt(); + } + public void disconnect(final boolean force) { + interrupt(); Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": disconnecting force="+Boolean.valueOf(force)); if (force) { forceCloseSocket(); -- cgit v1.2.3