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

am e1145d17: In EAS flow mode, don\'t try to use auto-setup (fixes #2143583)

Browse Source 
Merge commit 'e1145d173971ebe741e42e9caa209ef2f7bbefa4' into eclair-plus-aosp

* commit 'e1145d173971ebe741e42e9caa209ef2f7bbefa4':
  In EAS flow mode, don't try to use auto-setup (fixes #2143583)
This commit is contained in:
Marc Blank 2009-09-24 12:03:00 -07:00 committed by Android Git Automerger
commit 215f76aa95
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/android/email/activity/setup/AccountSetupBasics.java
View File

@ -344,25 +344,23 @@ public class AccountSetupBasics extends Activity
} }
private void onNext() { private void onNext() {
String email = mEmailView.getText().toString().trim(); // If this is EAS flow, don't try to find a provider for the domain!
String[] emailParts = email.split("@"); if (!mEasFlowMode) {
String domain = emailParts[1].trim(); String email = mEmailView.getText().toString().trim();
mProvider = findProviderForDomain(domain); String[] emailParts = email.split("@");
if (mProvider == null) { String domain = emailParts[1].trim();
/* mProvider = findProviderForDomain(domain);
* We don't have default settings for this account, start the manual if (mProvider != null) {
* setup process. if (mProvider.note != null) {
*/ showDialog(DIALOG_NOTE);
onManualSetup(); } else {
return; finishAutoSetup();
} }
return;
if (mProvider.note != null) { }
showDialog(DIALOG_NOTE);
}
else {
finishAutoSetup();
} }
// Can't use auto setup
onManualSetup();
} }
/** /**