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:
commit
d12032bd09
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue