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

Merge "Fix FLAG_OAUTH usage" into ub-mail-master

This commit is contained in:
Tony Mantler 2014-05-15 16:42:40 +00:00 committed by Android (Google) Code Review
parent e0e29edb04 34c2e1619d
commit 018ff4b464
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
emailcommon/src/com/android/emailcommon/provider/HostAuth.java
View File

@ -57,7 +57,7 @@ public class HostAuth extends EmailContent implements Parcelable {
public static final int FLAG_OAUTH = 0x10; // Use OAuth for authentication
// Mask of settings directly configurable by the user
public static final int USER_CONFIG_MASK = 0x1b;
public static final int FLAG_TRANSPORTSECURITY_MASK = FLAG_SSL | FLAG_TLS;
public static final int FLAG_TRANSPORTSECURITY_MASK = FLAG_SSL | FLAG_TLS | FLAG_TRUST_ALL;
public String mProtocol;
public String mAddress;
@ -127,10 +127,13 @@ public class HostAuth extends EmailContent implements Parcelable {
* creating it if it does not yet exist. This should not be called on the
* main thread.
*
* As a side-effect, it also ensures FLAG_OAUTH is set. Use {@link #removeCredential()} to clear
*
* @param context for provider loads
* @return the credential object for this HostAuth
*/
public Credential getOrCreateCredential(Context context) {
mFlags |= FLAG_OAUTH;
if (mCredential == null) {
if (mCredentialKey >= 0) {
mCredential = Credential.restoreCredentialsWithId(context, mCredentialKey);
@ -147,6 +150,7 @@ public class HostAuth extends EmailContent implements Parcelable {
public void removeCredential() {
mCredential = null;
mCredentialKey = -1;
mFlags &= ~FLAG_OAUTH;
}
/**
@ -225,6 +229,9 @@ public class HostAuth extends EmailContent implements Parcelable {
mDomain = cursor.getString(CONTENT_DOMAIN_COLUMN);
mClientCertAlias = cursor.getString(CONTENT_CLIENT_CERT_ALIAS_COLUMN);
mCredentialKey = cursor.getLong(CONTENT_CREDENTIAL_KEY_COLUMN);
if (mCredentialKey != -1) {
mFlags |= FLAG_OAUTH;
}
}
@Override

6
src/com/android/email/activity/setup/AccountSettings.java
View File

@ -620,11 +620,13 @@ public class AccountSettings extends PreferenceActivity implements
@VisibleForTesting
protected AccountSettingsFragment getSettingsFragment() {
return mAccountSettingsFragment;
return mAccountSettingsFragment != null && mAccountSettingsFragment.isAdded() ?
mAccountSettingsFragment : null;
}
protected AccountServerBaseFragment getAccountServerFragment() {
return mAccountServerFragment;
return mAccountServerFragment != null && mAccountServerFragment.isAdded() ?
mAccountServerFragment : null;
}
/**

2
src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java
View File

@ -242,7 +242,7 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment
}
}
final int flags = sendAuth.mFlags & ~HostAuth.FLAG_AUTHENTICATE;
final int flags = sendAuth.mFlags & HostAuth.FLAG_TRANSPORTSECURITY_MASK;
SpinnerOption.setSpinnerOptionValue(mSecurityTypeView, flags);
final String hostname = sendAuth.mAddress;