diff options
author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-19 02:19:26 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-19 02:19:26 +0200 |
commit | 8c596682730de422fae9489287fee27b36137c1a (patch) | |
tree | 0113f536dfe3a0f3a4317bc4228bf64f42b95667 | |
parent | 1235e3daca59d107e663319fc72e800ed94378bd (diff) |
made debugging verbose again on specific parts
-rw-r--r-- | src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java | 6 | ||||
-rw-r--r-- | src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java index 7c5a0f63a..1f6b629cb 100644 --- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -119,17 +119,20 @@ public class JingleConnection { @Override public void failed() { + Log.d("xmppService","connection to our own primary candidete failed"); sendInitRequest(); } @Override public void established() { + Log.d("xmppService","succesfully connected to our own primary candidate"); mergeCandidate(candidate); sendInitRequest(); } }); mergeCandidate(candidate); } else { + Log.d("xmppService","no primary candidate of our own was found"); sendInitRequest(); } } @@ -216,6 +219,7 @@ public class JingleConnection { @Override public void failed() { + Log.d("xmppService","connection to our own primary candidate failed"); content.setCandidates(transportId, getCandidatesAsElements()); packet.setContent(content); sendJinglePacket(packet); @@ -223,6 +227,7 @@ public class JingleConnection { @Override public void established() { + Log.d("xmppService","connected to primary candidate"); mergeCandidate(candidate); content.setCandidates(transportId, getCandidatesAsElements()); packet.setContent(content); @@ -230,6 +235,7 @@ public class JingleConnection { } }); } else { + Log.d("xmppService","did not find a primary candidate for ourself"); content.setCandidates(transportId, getCandidatesAsElements()); packet.setContent(content); sendJinglePacket(packet); diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java index a45ebb767..4618a1beb 100644 --- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java +++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java @@ -3,8 +3,8 @@ package eu.siacs.conversations.xmpp.jingle; import java.math.BigInteger; import java.security.SecureRandom; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.concurrent.ConcurrentHashMap; import android.util.Log; @@ -20,10 +20,9 @@ public class JingleConnectionManager { private XmppConnectionService xmppConnectionService; - private List<JingleConnection> connections = new ArrayList<JingleConnection>(); // make - // concurrent + private List<JingleConnection> connections = new ArrayList<JingleConnection>(); - private ConcurrentHashMap<String, JingleCandidate> primaryCandidates = new ConcurrentHashMap<String, JingleCandidate>(); + private HashMap<String, JingleCandidate> primaryCandidates = new HashMap<String, JingleCandidate>(); private SecureRandom random = new SecureRandom(); @@ -110,6 +109,7 @@ public class JingleConnectionManager { } } else { + Log.d("xmppService","found primary candidate in archive"); listener.onPrimaryCandidateFound(true, this.primaryCandidates.get(account.getJid())); } |