Merge "Handle redirection during validation." into jb-ub-mail-ur10
This commit is contained in:
commit
fb6a74b5e0
|
@ -60,6 +60,7 @@ public class EmailServiceProxy extends ServiceProxy implements IEmailService {
|
||||||
public static final String VALIDATE_BUNDLE_UNSUPPORTED_POLICIES =
|
public static final String VALIDATE_BUNDLE_UNSUPPORTED_POLICIES =
|
||||||
"validate_unsupported_policies";
|
"validate_unsupported_policies";
|
||||||
public static final String VALIDATE_BUNDLE_PROTOCOL_VERSION = "validate_protocol_version";
|
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 final IEmailServiceCallback mCallback;
|
||||||
private Object mReturn = null;
|
private Object mReturn = null;
|
||||||
|
|
|
@ -477,6 +477,11 @@ public class AccountCheckSettingsFragment extends Fragment {
|
||||||
EmailServiceProxy.VALIDATE_BUNDLE_PROTOCOL_VERSION);
|
EmailServiceProxy.VALIDATE_BUNDLE_PROTOCOL_VERSION);
|
||||||
resultCode = bundle.getInt(
|
resultCode = bundle.getInt(
|
||||||
EmailServiceProxy.VALIDATE_BUNDLE_RESULT_CODE);
|
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
|
// Only show "policies required" if this is a new account setup
|
||||||
if (resultCode == MessagingException.SECURITY_POLICIES_REQUIRED &&
|
if (resultCode == MessagingException.SECURITY_POLICIES_REQUIRED &&
|
||||||
mAccount.isSaved()) {
|
mAccount.isSaved()) {
|
||||||
|
|
Loading…
Reference in New Issue