diff options
| -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; + } } } } |