diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-11-09 17:06:09 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-11-09 17:06:09 +0100 |
| commit | cb1a36da7930aaa553ffd525fc9d2d07547d50b9 (patch) | |
| tree | a24ea0c29c570dc9e10c0dbd6c7d0766855d4ef0 /src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java | |
| parent | 44de982877c04fadc80be0d377f09fab24a3b74c (diff) | |
| parent | 180a0e44084752431d702677d68d06ae82524d33 (diff) | |
Merge pull request #642 from SamWhited/accountgetjid
Rework `Account.getJid()' to return full JIDs
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java index 6684a4c6..05a658be 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java @@ -75,7 +75,7 @@ public class JingleConnectionManager extends AbstractConnectionManager { public void getPrimaryCandidate(Account account, final OnPrimaryCandidateFound listener) { - if (!this.primaryCandidates.containsKey(account.getJid())) { + if (!this.primaryCandidates.containsKey(account.getJid().toBareJid())) { String xmlns = "http://jabber.org/protocol/bytestreams"; final String proxy = account.getXmppConnection() .findDiscoItemByFeature(xmlns); @@ -109,7 +109,7 @@ public class JingleConnectionManager extends AbstractConnectionManager { candidate.setJid(null); } candidate.setPriority(655360 + 65535); - primaryCandidates.put(account.getJid(), + primaryCandidates.put(account.getJid().toBareJid(), candidate); listener.onPrimaryCandidateFound(true, candidate); @@ -125,7 +125,7 @@ public class JingleConnectionManager extends AbstractConnectionManager { } else { listener.onPrimaryCandidateFound(true, - this.primaryCandidates.get(account.getJid())); + this.primaryCandidates.get(account.getJid().toBareJid())); } } |