am f44d334f: am ebfa64a7: am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev

* commit 'f44d334f4a51768a7044dea3feeae7b1c2ca7780':
  Use correct password dialog for outgoing settings
This commit is contained in:
Tony Mantler 2014-11-02 17:37:20 +00:00 committed by Android Git Automerger
commit a78ba75e45

View File

@ -410,8 +410,10 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment
@Override @Override
public void onRequestSignIn() { public void onRequestSignIn() {
// Launch the credential activity. // Launch the credential activity.
// Use HostAuthRecv here because we want to know if this is account is IMAP (offer OAuth) or
// if it's POP (password only)
final String protocol = final String protocol =
mSetupData.getAccount().getOrCreateHostAuthSend(mAppContext).mProtocol; mSetupData.getAccount().getOrCreateHostAuthRecv(mAppContext).mProtocol;
final Intent intent = AccountCredentials.getAccountCredentialsIntent(getActivity(), final Intent intent = AccountCredentials.getAccountCredentialsIntent(getActivity(),
mUsernameView.getText().toString(), protocol); mUsernameView.getText().toString(), protocol);
startActivityForResult(intent, SIGN_IN_REQUEST); startActivityForResult(intent, SIGN_IN_REQUEST);