diff options
| author | Martin Hibdon <mhibdon@google.com> | 2014-10-03 02:14:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-03 02:14:01 +0000 |
| commit | 46f1b89fefc4b8d98b3a9bcc54ff71fae6af9c61 (patch) | |
| tree | d94852d715cb7b2805e09a566d00e609da6119a5 /provider_src | |
| parent | ec8c2ac9dff2a60d2ac30ff292102477d9809355 (diff) | |
| parent | 601700a61e453c612e0dabe4e93002766b3751b7 (diff) | |
| download | android_packages_apps_Email-46f1b89fefc4b8d98b3a9bcc54ff71fae6af9c61.tar.gz android_packages_apps_Email-46f1b89fefc4b8d98b3a9bcc54ff71fae6af9c61.tar.bz2 android_packages_apps_Email-46f1b89fefc4b8d98b3a9bcc54ff71fae6af9c61.zip | |
Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev
Diffstat (limited to 'provider_src')
| -rw-r--r-- | provider_src/com/android/email/mail/transport/MailTransport.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/provider_src/com/android/email/mail/transport/MailTransport.java b/provider_src/com/android/email/mail/transport/MailTransport.java index 213fbfc99..74d0ab59e 100644 --- a/provider_src/com/android/email/mail/transport/MailTransport.java +++ b/provider_src/com/android/email/mail/transport/MailTransport.java @@ -112,7 +112,7 @@ public class MailTransport { SocketAddress socketAddress = new InetSocketAddress(getHost(), getPort()); if (canTrySslSecurity()) { mSocket = SSLUtils.getSSLSocketFactory( - mContext, mHostAuth, canTrustAllCertificates()).createSocket(); + mContext, mHostAuth, null, canTrustAllCertificates()).createSocket(); } else { mSocket = new Socket(); } @@ -152,7 +152,8 @@ public class MailTransport { */ public void reopenTls() throws MessagingException { try { - mSocket = SSLUtils.getSSLSocketFactory(mContext, mHostAuth, canTrustAllCertificates()) + mSocket = SSLUtils.getSSLSocketFactory(mContext, mHostAuth, null, + canTrustAllCertificates()) .createSocket(mSocket, getHost(), getPort(), true); mSocket.setSoTimeout(SOCKET_READ_TIMEOUT); mIn = new BufferedInputStream(mSocket.getInputStream(), 1024); |