Fix some broken tests
b/13085182 You can't look up emailServiceInfo for smtp, we don't store that in services.xml. The thing is, if we're using outgoing settings, we're always using smtp, which allows oauth. Change-Id: I5c6032e8d5020ba83fa1c803666b83f134f87f75
This commit is contained in:
parent
56b7ef3c0d
commit
10c7412555
|
@ -75,7 +75,6 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment
|
||||||
private EditText mPortView;
|
private EditText mPortView;
|
||||||
private CheckBox mRequireLoginView;
|
private CheckBox mRequireLoginView;
|
||||||
private Spinner mSecurityTypeView;
|
private Spinner mSecurityTypeView;
|
||||||
private EmailServiceInfo mServiceInfo;
|
|
||||||
|
|
||||||
// Support for lifecycle
|
// Support for lifecycle
|
||||||
private boolean mStarted;
|
private boolean mStarted;
|
||||||
|
@ -283,7 +282,6 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment
|
||||||
if (mLoaded) return;
|
if (mLoaded) return;
|
||||||
|
|
||||||
final HostAuth sendAuth = mSetupData.getAccount().getOrCreateHostAuthSend(mContext);
|
final HostAuth sendAuth = mSetupData.getAccount().getOrCreateHostAuthSend(mContext);
|
||||||
mServiceInfo = EmailServiceUtils.getServiceInfo(mContext, sendAuth.mProtocol);
|
|
||||||
if ((sendAuth.mFlags & HostAuth.FLAG_AUTHENTICATE) != 0) {
|
if ((sendAuth.mFlags & HostAuth.FLAG_AUTHENTICATE) != 0) {
|
||||||
final String username = sendAuth.mLogin;
|
final String username = sendAuth.mLogin;
|
||||||
if (username != null) {
|
if (username != null) {
|
||||||
|
@ -293,11 +291,7 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment
|
||||||
|
|
||||||
mAuthenticationView.setAuthInfo(true, sendAuth);
|
mAuthenticationView.setAuthInfo(true, sendAuth);
|
||||||
if (mAuthenticationLabel != null) {
|
if (mAuthenticationLabel != null) {
|
||||||
if (mServiceInfo.offerOAuth) {
|
mAuthenticationLabel.setText(R.string.authentication_label);
|
||||||
mAuthenticationLabel.setText(R.string.authentication_label);
|
|
||||||
} else {
|
|
||||||
mAuthenticationLabel.setText(R.string.password_label);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@ import android.widget.EditText;
|
||||||
import com.android.email.R;
|
import com.android.email.R;
|
||||||
import com.android.email.activity.setup.AccountSetupOutgoing;
|
import com.android.email.activity.setup.AccountSetupOutgoing;
|
||||||
import com.android.email.activity.setup.AccountSetupOutgoingFragment;
|
import com.android.email.activity.setup.AccountSetupOutgoingFragment;
|
||||||
|
import com.android.email.activity.setup.AuthenticationView;
|
||||||
import com.android.email.activity.setup.SetupDataFragment;
|
import com.android.email.activity.setup.SetupDataFragment;
|
||||||
import com.android.emailcommon.provider.Account;
|
import com.android.emailcommon.provider.Account;
|
||||||
import com.android.emailcommon.provider.HostAuth;
|
import com.android.emailcommon.provider.HostAuth;
|
||||||
|
@ -44,7 +45,7 @@ public class AccountSetupOutgoingTests extends
|
||||||
private AccountSetupOutgoing mActivity;
|
private AccountSetupOutgoing mActivity;
|
||||||
private AccountSetupOutgoingFragment mFragment;
|
private AccountSetupOutgoingFragment mFragment;
|
||||||
private EditText mServerView;
|
private EditText mServerView;
|
||||||
private EditText mPasswordView;
|
private AuthenticationView mAuthenticationView;
|
||||||
|
|
||||||
public AccountSetupOutgoingTests() {
|
public AccountSetupOutgoingTests() {
|
||||||
super(AccountSetupOutgoing.class);
|
super(AccountSetupOutgoing.class);
|
||||||
|
@ -159,7 +160,7 @@ public class AccountSetupOutgoingTests extends
|
||||||
* @param expectNext true if expected that this password will enable the "next" button
|
* @param expectNext true if expected that this password will enable the "next" button
|
||||||
*/
|
*/
|
||||||
private void checkPassword(String password, boolean expectNext) throws URISyntaxException {
|
private void checkPassword(String password, boolean expectNext) throws URISyntaxException {
|
||||||
mPasswordView.setText(password);
|
mAuthenticationView.setPassword(password);
|
||||||
if (expectNext) {
|
if (expectNext) {
|
||||||
assertTrue(mActivity.mNextButtonEnabled);
|
assertTrue(mActivity.mNextButtonEnabled);
|
||||||
} else {
|
} else {
|
||||||
|
@ -178,7 +179,7 @@ public class AccountSetupOutgoingTests extends
|
||||||
mActivity = getActivity();
|
mActivity = getActivity();
|
||||||
mFragment = mActivity.mFragment;
|
mFragment = mActivity.mFragment;
|
||||||
mServerView = (EditText) mActivity.findViewById(R.id.account_server);
|
mServerView = (EditText) mActivity.findViewById(R.id.account_server);
|
||||||
mPasswordView = (EditText) mActivity.findViewById(R.id.account_server);
|
mAuthenticationView = (AuthenticationView) mActivity.findViewById(R.id.account_server);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue