ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update client connection manager w/ bdc fix in AOSP branch

Browse Source 
Bug: 6838215
Change-Id: I39a2ea0b54aca34062e1a2ccc472e701c3ef2f79
This commit is contained in:
Marc Blank 2012-08-16 11:45:13 -07:00
parent cf3b3ae987
commit 0e969171bb
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java
View File

@ -102,11 +102,10 @@ public class EmailClientConnectionManager extends ThreadSafeClientConnManager {
}
KeyManager keyManager =
KeyChainKeyManager.fromAlias(context, hostAuth.mClientCertAlias);
SSLCertificateSocketFactory underlying = SSLUtils.getSSLSocketFactory(context, hostAuth,
false);
underlying.setKeyManagers(new KeyManager[] { keyManager });
registry.register(
new Scheme(schemeName, new SSLSocketFactory(underlying), hostAuth.mPort));
boolean insecure = hostAuth.shouldTrustAllServerCerts();
SSLSocketFactory ssf =
SSLUtils.getHttpSocketFactory(context, hostAuth, keyManager, insecure);
registry.register(new Scheme(schemeName, ssf, hostAuth.mPort));
}
}