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

Move credential population to after we collect credentials

Browse Source 
b/13512724

Change-Id: I2df8064fc392a928d77291aa41630e4715bedc39
This commit is contained in:
Tony Mantler 2014-03-18 16:45:07 -07:00
parent 452744474a
commit d90643c732
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -739,6 +739,18 @@ public class AccountSetupFinal extends AccountSetupActivity
getContentFragment();
final Bundle results = f.getCredentialResults();
mSetupData.setCredentialResults(results);
final Account account = mSetupData.getAccount();
final HostAuth recvAuth = account.getOrCreateHostAuthRecv(this);
AccountSetupCredentialsFragment.populateHostAuthWithResults(this, recvAuth,
mSetupData.getCredentialResults());
mSetupData.setIncomingCredLoaded(true);
final EmailServiceUtils.EmailServiceInfo info = mSetupData.getIncomingServiceInfo(this);
if (info.usesSmtp) {
final HostAuth sendAuth = account.getOrCreateHostAuthSend(this);
AccountSetupCredentialsFragment.populateHostAuthWithResults(this, sendAuth,
mSetupData.getCredentialResults());
mSetupData.setOutgoingCredLoaded(true);
}
}
@Override
@ -767,9 +779,6 @@ public class AccountSetupFinal extends AccountSetupActivity
final HostAuth recvAuth = account.getOrCreateHostAuthRecv(this);
recvAuth.setHostAuthFromString(mProvider.incomingUri);
recvAuth.setUserName(mProvider.incomingUsername);
AccountSetupCredentialsFragment.populateHostAuthWithResults(this, recvAuth,
mSetupData.getCredentialResults());
mSetupData.setIncomingCredLoaded(true);
final EmailServiceUtils.EmailServiceInfo info = mSetupData.getIncomingServiceInfo(this);
recvAuth.mPort =
@ -779,9 +788,6 @@ public class AccountSetupFinal extends AccountSetupActivity
final HostAuth sendAuth = account.getOrCreateHostAuthSend(this);
sendAuth.setHostAuthFromString(mProvider.outgoingUri);
sendAuth.setUserName(mProvider.outgoingUsername);
AccountSetupCredentialsFragment.populateHostAuthWithResults(this, sendAuth,
mSetupData.getCredentialResults());
mSetupData.setOutgoingCredLoaded(true);
}
// Populate the setup data, assuming that the duplicate account check will succeed