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

Port new EmailClientConfigurationManager code from jb-dev 

Change-Id: Ibb07415a2b78e6160999d44b21ccd24406447f88
This commit is contained in:
Marc Blank 2012-05-21 09:52:19 -07:00
parent 323eea8ac8
commit 0d296a66d8
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
email2/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java
View File

@ -42,7 +42,10 @@ import javax.net.ssl.KeyManager;
*/
public class EmailClientConnectionManager extends ThreadSafeClientConnManager {
private static final int STANDARD_PORT = 80;
private static final int STANDARD_SSL_PORT = 443;
private static final boolean LOG_ENABLED = false;
/**
* A {@link KeyManager} to track client certificate requests from servers.
*/
@ -63,16 +66,15 @@ public class EmailClientConnectionManager extends ThreadSafeClientConnManager {
// Create a registry for our three schemes; http and https will use built-in factories
SchemeRegistry registry = new SchemeRegistry();
if (!ssl) {
registry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), port));
} else {
// Register https with the secure factory
registry.register(new Scheme("https",
SSLUtils.getHttpSocketFactory(false, keyManager), port));
// Register the httpts scheme with our insecure factory
registry.register(new Scheme("httpts",
SSLUtils.getHttpSocketFactory(true /*insecure*/, keyManager), port));
}
registry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(),
ssl ? STANDARD_PORT : port));
// Register https with the secure factory
registry.register(new Scheme("https",
SSLUtils.getHttpSocketFactory(false, keyManager), ssl ? port : STANDARD_SSL_PORT));
// Register the httpts scheme with our insecure factory
registry.register(new Scheme("httpts",
SSLUtils.getHttpSocketFactory(true /*insecure*/, keyManager),
ssl ? port : STANDARD_SSL_PORT));
return new EmailClientConnectionManager(params, registry, keyManager);
}