aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/xmpp/jingle
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-08-19 15:06:50 +0200
committeriNPUTmice <daniel@gultsch.de>2014-08-19 15:06:50 +0200
commit3b79cc2f23617903dda1876f80fd295d45e9ba3b (patch)
treeae346f109c9a0b96890d8769be0bccca5dbfc2af /src/eu/siacs/conversations/xmpp/jingle
parentd74692e0a582edc7d9701f58d19ca812a39096bc (diff)
better error display and additional infos (stats) for the edit account activity
Diffstat (limited to 'src/eu/siacs/conversations/xmpp/jingle')
-rw-r--r--src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index dafb2639..44d6b9f0 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -2,11 +2,11 @@ package eu.siacs.conversations.xmpp.jingle;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
import android.content.Intent;
import android.graphics.BitmapFactory;
@@ -48,7 +48,7 @@ public class JingleConnection {
private String initiator;
private String responder;
private List<JingleCandidate> candidates = new ArrayList<JingleCandidate>();
- private HashMap<String, JingleSocks5Transport> connections = new HashMap<String, JingleSocks5Transport>();
+ private ConcurrentHashMap<String, JingleSocks5Transport> connections = new ConcurrentHashMap<String, JingleSocks5Transport>();
private String transportId;
private Element fileOffer;
@@ -696,6 +696,7 @@ public class JingleConnection {
}
public void cancel() {
+ this.status = STATUS_CANCELED;
this.disconnect();
if (this.message != null) {
if (this.responder.equals(account.getFullJid())) {
@@ -711,7 +712,6 @@ public class JingleConnection {
}
}
}
- this.status = STATUS_CANCELED;
this.mJingleConnectionManager.finishConnection(this);
}