diff options
author | Scott Kennedy <skennedy@android.com> | 2014-12-17 00:22:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 00:22:24 +0000 |
commit | 9a3a28797dc395179c664f98f4b16fc225e20923 (patch) | |
tree | 539c4783d651eba1ef6f0f7110f0458bcb89b33f | |
parent | a347433a0307304f714a0ba22b7447afd94ed107 (diff) | |
parent | ebd1805902eb5565c8ed97dd8067474969f777e2 (diff) | |
download | android_packages_apps_Exchange-9a3a28797dc395179c664f98f4b16fc225e20923.tar.gz android_packages_apps_Exchange-9a3a28797dc395179c664f98f4b16fc225e20923.tar.bz2 android_packages_apps_Exchange-9a3a28797dc395179c664f98f4b16fc225e20923.zip |
am ebd18059: am 6142a7d8: Merge "Exchange: use the port returned by autodiscover response"
* commit 'ebd1805902eb5565c8ed97dd8067474969f777e2':
Exchange: use the port returned by autodiscover response
-rw-r--r-- | src/com/android/exchange/eas/EasAutoDiscover.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/exchange/eas/EasAutoDiscover.java b/src/com/android/exchange/eas/EasAutoDiscover.java index d3927acf..4cd963c8 100644 --- a/src/com/android/exchange/eas/EasAutoDiscover.java +++ b/src/com/android/exchange/eas/EasAutoDiscover.java @@ -213,7 +213,9 @@ public class EasAutoDiscover extends EasOperation { mHostAuth.mPassword = mPassword; // Note: there is no way we can auto-discover the proper client // SSL certificate to use, if one is needed. - mHostAuth.mPort = 443; + if (mHostAuth.mPort == -1) { + mHostAuth.mPort = 443; + } mHostAuth.mProtocol = Eas.PROTOCOL; mHostAuth.mFlags = HostAuth.FLAG_SSL | HostAuth.FLAG_AUTHENTICATE; return RESULT_OK; @@ -257,7 +259,12 @@ public class EasAutoDiscover extends EasOperation { final String url = parser.nextText(); if (url != null) { LogUtils.d(TAG, "Autodiscover URL: %s", url); - hostAuth.mAddress = Uri.parse(url).getHost(); + final Uri uri = Uri.parse(url); + hostAuth.mAddress = uri.getHost(); + int port = uri.getPort(); + if (port != -1) { + hostAuth.mPort = port; + } } } } |