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

am fb6a74b5: Merge "Handle redirection during validation." into jb-ub-mail-ur10

Browse Source 
* commit 'fb6a74b5e0b1e4c0ae9d98e8f6cb70c805f8435e':
  Handle redirection during validation.
This commit is contained in:
Yu Ping Hu 2013-05-23 15:53:45 -07:00 committed by Android Git Automerger
commit 287b6100cb
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java
View File

@ -60,6 +60,7 @@ public class EmailServiceProxy extends ServiceProxy implements IEmailService {
public static final String VALIDATE_BUNDLE_UNSUPPORTED_POLICIES =
"validate_unsupported_policies";
public static final String VALIDATE_BUNDLE_PROTOCOL_VERSION = "validate_protocol_version";
public static final String VALIDATE_BUNDLE_REDIRECT_ADDRESS = "validate_redirect_address";
private final IEmailServiceCallback mCallback;
private Object mReturn = null;

5
src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
View File

@ -477,6 +477,11 @@ public class AccountCheckSettingsFragment extends Fragment {
EmailServiceProxy.VALIDATE_BUNDLE_PROTOCOL_VERSION);
resultCode = bundle.getInt(
EmailServiceProxy.VALIDATE_BUNDLE_RESULT_CODE);
final String redirectAddress = bundle.getString(
EmailServiceProxy.VALIDATE_BUNDLE_REDIRECT_ADDRESS, null);
if (redirectAddress != null) {
mAccount.mHostAuthRecv.mAddress = redirectAddress;
}
// Only show "policies required" if this is a new account setup
if (resultCode == MessagingException.SECURITY_POLICIES_REQUIRED &&
mAccount.isSaved()) {