diff options
| author | Scott Kennedy <skennedy@android.com> | 2014-12-17 00:08:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-17 00:08:58 +0000 |
| commit | 6142a7d8f746b5b7ed7c301e6dcfb5248382a524 (patch) | |
| tree | 20da3b6d992b1a5f081b8e3a893cf0624d11b621 | |
| parent | 7766cd438bf2ec7aa113b9d9e1a35fa94926ea54 (diff) | |
| parent | 3860b0c076536883b808c5d865e7e3a509527a69 (diff) | |
| download | android_packages_apps_Exchange-6142a7d8f746b5b7ed7c301e6dcfb5248382a524.tar.gz android_packages_apps_Exchange-6142a7d8f746b5b7ed7c301e6dcfb5248382a524.tar.bz2 android_packages_apps_Exchange-6142a7d8f746b5b7ed7c301e6dcfb5248382a524.zip | |
Merge "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 cbcb032b..44afb1ec 100644 --- a/src/com/android/exchange/eas/EasAutoDiscover.java +++ b/src/com/android/exchange/eas/EasAutoDiscover.java @@ -205,7 +205,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; @@ -249,7 +251,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; + } } } } |