diff options
author | Sebastien Vincent <seb@jitsi.org> | 2011-12-07 16:26:43 +0000 |
---|---|---|
committer | Sebastien Vincent <seb@jitsi.org> | 2011-12-07 16:26:43 +0000 |
commit | 35f06fedc59cc0b12f846dd5c323ee9bcbecbaa9 (patch) | |
tree | cd84d067f41456a25c30e8c22aa97a6dcb457f78 /src/net/java/sip | |
parent | fab390e903529861e43a8ff9e498ef8dac830188 (diff) | |
download | jitsi-35f06fedc59cc0b12f846dd5c323ee9bcbecbaa9.zip jitsi-35f06fedc59cc0b12f846dd5c323ee9bcbecbaa9.tar.gz jitsi-35f06fedc59cc0b12f846dd5c323ee9bcbecbaa9.tar.bz2 |
Fixes GoogleContacts support for domain without xmpp-client SRV.
Diffstat (limited to 'src/net/java/sip')
-rw-r--r-- | src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsSourceService.java | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsSourceService.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsSourceService.java index 518d5e2..7ce8ead 100644 --- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsSourceService.java +++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsSourceService.java @@ -198,24 +198,22 @@ public class GoogleContactsSourceService SRVRecord srvRecords[] = NetworkUtils.getSRVRecords("xmpp-client", "tcp", domain); - if(srvRecords == null) + if(srvRecords != null) { - return null; - } - - // To detect that account is a google ones, we try the following: - // - lookup in SRV and see if it is google.com; - // - if the account has been created with GoogleTalk form; - // - if it is an "external" google contact. + // To detect that account is a google ones, we try following: + // - lookup in SRV and see if it is google.com; + // - if the account has been created with GoogleTalk form; + // - if it is an "external" google contact. - // SRV checks - for(SRVRecord srv : srvRecords) - { - if(srv.getTarget().endsWith("google.com") || - srv.getTarget().endsWith("google.com.")) + // SRV checks + for(SRVRecord srv : srvRecords) { - isGoogleAppsOrGmail = true; - break; + if(srv.getTarget().endsWith("google.com") || + srv.getTarget().endsWith("google.com.")) + { + isGoogleAppsOrGmail = true; + break; + } } } |