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

Misc cleanups and avoid logging PII

Browse Source 
Change-Id: I9f906dabe0dd00a434ff88878f0639c835b2e2a7
This commit is contained in:
Ben Komalo 2011-06-23 19:41:47 -07:00
parent 1ce33fd93f
commit 877b9070fa
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
View File

@ -45,7 +45,7 @@ public class SSLUtils {
*
* @param insecure if true, bypass all SSL certificate checks
*/
public synchronized static final SSLCertificateSocketFactory getSSLSocketFactory(
public synchronized static SSLCertificateSocketFactory getSSLSocketFactory(
boolean insecure) {
if (insecure) {
if (sInsecureFactory == null) {
@ -102,7 +102,6 @@ public class SSLUtils {
return sb.toString();
}
@SuppressWarnings("unused")
private static abstract class StubKeyManager extends X509ExtendedKeyManager {
@Override public abstract String chooseClientAlias(
String[] keyTypes, Principal[] issuers, Socket socket);
@ -204,15 +203,19 @@ public class SSLUtils {
}
if (certificateChain == null || privateKey == null) {
throw new CertificateException(
"Can't access certificate from keystore for alias [" + alias + "]");
throw new CertificateException("Can't access certificate from keystore");
}
return new KeyChainKeyManager(alias, certificateChain, privateKey);
}
private static void logError(String alias, String type, Exception ex) {
Log.e(TAG, "Unable to retrieve " + type + " for [" + alias + "] due to " + ex);
// Avoid logging PII when explicit logging is not on.
if (LOG_ENABLED) {
Log.e(TAG, "Unable to retrieve " + type + " for [" + alias + "] due to " + ex);
} else {
Log.e(TAG, "Unable to retrieve " + type + " due to " + ex);
}
}
private KeyChainKeyManager(