narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

made debugging verbose again on specific parts

Browse source
This commit is contained in:
Daniel Gultsch 2014-04-19 02:19:26 +02:00
parent 1235e3daca
commit 8c59668273
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View file

@ -119,17 +119,20 @@ public class JingleConnection {
@Override @Override
public void failed() { public void failed() {
Log.d("xmppService","connection to our own primary candidete failed");
sendInitRequest(); sendInitRequest();
} }
@Override @Override
public void established() { public void established() {
Log.d("xmppService","succesfully connected to our own primary candidate");
mergeCandidate(candidate); mergeCandidate(candidate);
sendInitRequest(); sendInitRequest();
} }
}); });
mergeCandidate(candidate); mergeCandidate(candidate);
} else { } else {
Log.d("xmppService","no primary candidate of our own was found");
sendInitRequest(); sendInitRequest();
} }
} }
@ -216,6 +219,7 @@ public class JingleConnection {
@Override @Override
public void failed() { public void failed() {
Log.d("xmppService","connection to our own primary candidate failed");
content.setCandidates(transportId, getCandidatesAsElements()); content.setCandidates(transportId, getCandidatesAsElements());
packet.setContent(content); packet.setContent(content);
sendJinglePacket(packet); sendJinglePacket(packet);
@ -223,6 +227,7 @@ public class JingleConnection {
@Override @Override
public void established() { public void established() {
Log.d("xmppService","connected to primary candidate");
mergeCandidate(candidate); mergeCandidate(candidate);
content.setCandidates(transportId, getCandidatesAsElements()); content.setCandidates(transportId, getCandidatesAsElements());
packet.setContent(content); packet.setContent(content);
@ -230,6 +235,7 @@ public class JingleConnection {
} }
}); });
} else { } else {
Log.d("xmppService","did not find a primary candidate for ourself");
content.setCandidates(transportId, getCandidatesAsElements()); content.setCandidates(transportId, getCandidatesAsElements());
packet.setContent(content); packet.setContent(content);
sendJinglePacket(packet); sendJinglePacket(packet);

8
src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
View file

@ -3,8 +3,8 @@ package eu.siacs.conversations.xmpp.jingle;
import java.math.BigInteger; import java.math.BigInteger;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import android.util.Log; import android.util.Log;
@ -20,10 +20,9 @@ public class JingleConnectionManager {
private XmppConnectionService xmppConnectionService; private XmppConnectionService xmppConnectionService;
private List<JingleConnection> connections = new ArrayList<JingleConnection>(); // make private List<JingleConnection> connections = new ArrayList<JingleConnection>();
// concurrent
private ConcurrentHashMap<String, JingleCandidate> primaryCandidates = new ConcurrentHashMap<String, JingleCandidate>(); private HashMap<String, JingleCandidate> primaryCandidates = new HashMap<String, JingleCandidate>();
private SecureRandom random = new SecureRandom(); private SecureRandom random = new SecureRandom();
@ -110,6 +109,7 @@ public class JingleConnectionManager {
} }
} else { } else {
Log.d("xmppService","found primary candidate in archive");
listener.onPrimaryCandidateFound(true, listener.onPrimaryCandidateFound(true,
this.primaryCandidates.get(account.getJid())); this.primaryCandidates.get(account.getJid()));
} }