am d716d894
: Don\'t assume mHostAuthRecv is loaded when checking outgoing
* commit 'd716d89459f736402e74f3cfb2f20a71e50768f0': Don't assume mHostAuthRecv is loaded when checking outgoing
This commit is contained in:
commit
1428624915
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user