made debugging verbose again on specific parts

Daniel Gultsch created 12 years ago

Change summary

src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java        | 6 
src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java | 8 
2 files changed, 10 insertions(+), 4 deletions(-)

Detailed changes

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);

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()));
 		}