diff options
author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-19 11:58:35 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-19 11:58:35 +0200 |
commit | 8003e53013b72736db2137c51400fd0c5f124ffb (patch) | |
tree | 9392a7f50069a09c235e1f26f508ffb2f559a857 /src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java | |
parent | 7299fe7c8bd0f088c86371c7bec30fac3bdabd79 (diff) |
more jingle bug fixes
Diffstat (limited to 'src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java')
-rw-r--r-- | src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java index 1f6b629c..ad2d94f8 100644 --- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -426,9 +426,6 @@ public class JingleConnection { public void established() { Log.d("xmppService", "established connection with "+candidate.getHost()+":"+candidate.getPort()); sendCandidateUsed(candidate.getCid()); - if ((receivedCandidate)&&(status == STATUS_ACCEPTED)) { - connect(); - } } }); } @@ -450,9 +447,11 @@ public class JingleConnection { content.setAttribute("name", "a-file-offer"); content.setUsedCandidate(this.transportId, cid); packet.setContent(content); - Log.d("xmppService","send using candidate: "+cid); this.sendJinglePacket(packet); this.sentCandidate = true; + if ((receivedCandidate)&&(status == STATUS_ACCEPTED)) { + connect(); + } } private void sendCandidateError() { @@ -463,9 +462,11 @@ public class JingleConnection { content.setAttribute("name", "a-file-offer"); content.setCandidateError(this.transportId); packet.setContent(content); - Log.d("xmppService","send candidate error"); this.sendJinglePacket(packet); this.sentCandidate = true; + if ((receivedCandidate)&&(status == STATUS_ACCEPTED)) { + connect(); + } } public String getInitiator() { |