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

am 64bbe34d: am 12866ff1: am 0f3a01a4: am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing 

* commit '64bbe34de96b5b4d63e33c08a8484f7946460b5c':
  Don't assume mHostAuthRecv is loaded when checking outgoing
This commit is contained in:
Tony Mantler 2014-11-02 19:03:19 +00:00 committed by Android Git Automerger
parent b208347a77 64bbe34de9
commit 86e9a92c87
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
View File

@ -314,8 +314,8 @@ public class AccountCheckSettingsFragment extends Fragment {
final SetupDataFragment mSetupData; final SetupDataFragment mSetupData;
final Account mAccount; final Account mAccount;
final String mStoreHost; final String mStoreHost;
final String mCheckEmail;
final String mCheckPassword; final String mCheckPassword;
final String mCheckEmail;
/** /**
* Create task and parameterize it * Create task and parameterize it
@ -330,9 +330,14 @@ public class AccountCheckSettingsFragment extends Fragment {
mMode = mode; mMode = mode;
mSetupData = setupData; mSetupData = setupData;
mAccount = setupData.getAccount(); mAccount = setupData.getAccount();
mStoreHost = mAccount.mHostAuthRecv.mAddress; if (mAccount.mHostAuthRecv != null) {
mStoreHost = mAccount.mHostAuthRecv.mAddress;
mCheckPassword = mAccount.mHostAuthRecv.mPassword;
} else {
mStoreHost = null;
mCheckPassword = null;
}
mCheckEmail = mAccount.mEmailAddress; mCheckEmail = mAccount.mEmailAddress;
mCheckPassword = mAccount.mHostAuthRecv.mPassword;
} }
@Override @Override
@ -411,11 +416,18 @@ public class AccountCheckSettingsFragment extends Fragment {
} }
} }
final String protocol = mAccount.mHostAuthRecv.mProtocol; final EmailServiceInfo info;
final EmailServiceInfo info = EmailServiceUtils.getServiceInfo(mContext, protocol); if (mAccount.mHostAuthRecv != null) {
final String protocol = mAccount.mHostAuthRecv.mProtocol;
info = EmailServiceUtils
.getServiceInfo(mContext, protocol);
} else {
info = null;
}
// Check Outgoing Settings // Check Outgoing Settings
if (info.usesSmtp && (mMode & SetupDataFragment.CHECK_OUTGOING) != 0) { if ((info == null || info.usesSmtp) &&
(mMode & SetupDataFragment.CHECK_OUTGOING) != 0) {
if (isCancelled()) return null; if (isCancelled()) return null;
LogUtils.d(Logging.LOG_TAG, "Begin check of outgoing email settings"); LogUtils.d(Logging.LOG_TAG, "Begin check of outgoing email settings");
publishProgress(STATE_CHECK_OUTGOING); publishProgress(STATE_CHECK_OUTGOING);