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

am 4c6338bf: Make sure HostAuths are populated on manual setup 

* commit '4c6338bf1a87fa2829ff788d6493f31e952905aa':
  Make sure HostAuths are populated on manual setup
This commit is contained in:
Tony Mantler 2014-04-02 23:31:56 +00:00 committed by Android Git Automerger
parent cbc3d6abbc 4c6338bf1a
commit d12032bd09
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,6 +605,7 @@ public class AccountSetupFinal extends AccountSetupActivity
initiateCheckSettingsFragment(SetupDataFragment.CHECK_INCOMING
| SetupDataFragment.CHECK_OUTGOING);
} else {
populateHostAuthsFromSetupData();
if (mSkipAutoDiscover) {
mState = STATE_MANUAL_INCOMING;
updateContentFragment(true /* addToBackstack */);
@ -912,7 +913,7 @@ public class AccountSetupFinal extends AccountSetupActivity
@Override
public void onAccountServerSaveComplete() {}
private void initiateAutoDiscover() {
private void populateHostAuthsFromSetupData() {
final String email = mSetupData.getEmail();
final String[] emailParts = email.split("@");
final String domain = emailParts[1];
@ -938,7 +939,9 @@ public class AccountSetupFinal extends AccountSetupActivity
mSetupData.getCredentialResults());
mSetupData.setOutgoingCredLoaded(true);
}
}
private void initiateAutoDiscover() {
// Populate the setup data, assuming that the duplicate account check will succeed
initiateCheckSettingsFragment(SetupDataFragment.CHECK_AUTODISCOVER);
}