Make sure HostAuths are populated on manual setup

b/13751284

Change-Id: I61aa94e7ebedc5550854731caa068b9e577c2b3b
This commit is contained in:
Tony Mantler 2014-04-02 13:30:51 -07:00
parent 68da1ad73f
commit 4c6338bf1a
1 changed files with 4 additions and 1 deletions

View File

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