diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-12 21:54:42 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-12 21:54:46 +0200 |
commit | 2014f388b1f5eef66c8f787dc6889b03ae461d08 (patch) | |
tree | 7daf17e8e3d850a6204a3045be4ce6c6fb45d983 /src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | |
parent | cbdb4136136726d572b8bc521fc910f4dc31f00f (diff) |
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
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 9 |
1 files changed, 9 insertions, 0 deletions
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 ArrayList<Parcelable>values = result.getParcelableArrayList("values"); for(Iterator<Parcelable> 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(); |