diff options
| author | Sebastien Vincent <seb@jitsi.org> | 2010-09-07 15:43:35 +0000 |
|---|---|---|
| committer | Sebastien Vincent <seb@jitsi.org> | 2010-09-07 15:43:35 +0000 |
| commit | 840a4e51db5c2053b0e44c63c8c176ce4b6550d9 (patch) | |
| tree | acd2a83aef36bbc881ed38bb773ca11707d8036d /src/net/java/sip/communicator/impl | |
| parent | 7746c91783b490f5ca07d3b06a6d336ae1152253 (diff) | |
| download | jitsi-840a4e51db5c2053b0e44c63c8c176ce4b6550d9.zip jitsi-840a4e51db5c2053b0e44c63c8c176ce4b6550d9.tar.gz jitsi-840a4e51db5c2053b0e44c63c8c176ce4b6550d9.tar.bz2 | |
Fix Jingle calls with a google account (either gmail or google apps related ones).
Diffstat (limited to 'src/net/java/sip/communicator/impl')
2 files changed, 18 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java index 2cc3999..04d9013 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java @@ -382,8 +382,22 @@ public class ProtocolProviderServiceJabberImpl try { //XMPPConnection.DEBUG_ENABLED = true; - String userID - = StringUtils.parseName(getAccountID().getUserID()); + String userID = null; + + /* with a google account (either gmail or google apps + * related ones), the userID MUST be the full e-mail address + * not just the ID + */ + if(getAccountID().getProtocolDisplayName(). + equals("Google Talk")) + { + userID = getAccountID().getUserID(); + } + else + { + userID = StringUtils.parseName(getAccountID().getUserID()); + } + String serviceName = StringUtils.parseServer(getAccountID().getUserID()); diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JinglePacketFactory.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JinglePacketFactory.java index 65cecd0..b5dd27d 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JinglePacketFactory.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JinglePacketFactory.java @@ -30,8 +30,8 @@ public class JinglePacketFactory */ public static JingleIQ createRinging(JingleIQ sessionInitiate) { - return createSessionInfo(sessionInitiate.getFrom(), - sessionInitiate.getTo(), + return createSessionInfo(sessionInitiate.getTo(), + sessionInitiate.getFrom(), sessionInitiate.getSID(), SessionInfoType.ringing); } |