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

Merge "Fix ICS setup regression" into ics-mr1

Browse Source
This commit is contained in:
Marc Blank 2011-11-15 16:12:02 -08:00 committed by Android (Google) Code Review
commit bcadbc5fce
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -441,7 +441,7 @@ public class AccountCheckSettingsFragment extends Fragment {
} }
int errorCode = int errorCode =
result.getInt(EmailServiceProxy.AUTO_DISCOVER_BUNDLE_ERROR_CODE); result.getInt(EmailServiceProxy.AUTO_DISCOVER_BUNDLE_ERROR_CODE);
if (errorCode == MessagingException.AUTHENTICATION_FAILED) { if (errorCode == MessagingException.AUTODISCOVER_AUTHENTICATION_FAILED) {
return new AutoDiscoverResults(true, null); return new AutoDiscoverResults(true, null);
} else if (errorCode != MessagingException.NO_ERROR) { } else if (errorCode != MessagingException.NO_ERROR) {
return new AutoDiscoverResults(false, null); return new AutoDiscoverResults(false, null);
@ -609,6 +609,7 @@ public class AccountCheckSettingsFragment extends Fragment {
: R.string.account_setup_failed_dlg_certificate_message_fmt; : R.string.account_setup_failed_dlg_certificate_message_fmt;
break; break;
case MessagingException.AUTHENTICATION_FAILED: case MessagingException.AUTHENTICATION_FAILED:
case MessagingException.AUTODISCOVER_AUTHENTICATION_FAILED:
id = TextUtils.isEmpty(message) id = TextUtils.isEmpty(message)
? R.string.account_setup_failed_dlg_auth_message ? R.string.account_setup_failed_dlg_auth_message
: R.string.account_setup_failed_dlg_auth_message_fmt; : R.string.account_setup_failed_dlg_auth_message_fmt;