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

Use proper values for SSL flags; remove obsolete code

Browse Source 
Bug: 7013259

Change-Id: I8be865806844d4f7bad6bfe65d08735051de6db8
This commit is contained in:
Marc Blank 2012-08-18 13:31:00 -07:00
parent 49f5c000a9
commit e2cf1c58ed
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
imap2/src/com/android/imap2/smtp/MailTransport.java
View File

@ -59,18 +59,6 @@ public class MailTransport implements Transport {
private final HostAuth mHostAuth;
private final Context mContext;
private String[] mUserInfoParts;
/**
* One of the {@code Transport.CONNECTION_SECURITY_*} values.
*/
private int mConnectionSecurity;
/**
* Whether or not to trust all server certificates (i.e. skip host verification) in SSL
* handshakes
*/
private boolean mTrustCertificates;
private Socket mSocket;
private InputStream mIn;
@ -106,17 +94,17 @@ public class MailTransport implements Transport {
@Override
public boolean canTrySslSecurity() {
return mConnectionSecurity == Transport.CONNECTION_SECURITY_SSL;
return (mHostAuth.mFlags & HostAuth.FLAG_SSL) != 0;
}
@Override
public boolean canTryTlsSecurity() {
return mConnectionSecurity == Transport.CONNECTION_SECURITY_TLS;
return (mHostAuth.mFlags & HostAuth.FLAG_TLS) != 0;
}
@Override
public boolean canTrustAllCertificates() {
return mTrustCertificates;
return (mHostAuth.mFlags & HostAuth.FLAG_TRUST_ALL) != 0;
}
/**