From b38d0bbf8dff7e0b8fb8d0c2ae526360c30a72c5 Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Thu, 11 Sep 2014 13:22:02 -0700 Subject: [PATCH] Use correct password dialog for outgoing settings We actually want to divert based on incoming protocol, not outgoing b/17460124 Change-Id: Ic7129d23d36f9f15e2ecbb25d3f11dae12bb56ac --- .../email/activity/setup/AccountSetupOutgoingFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java b/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java index 139f82707..d9924c2f2 100644 --- a/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java +++ b/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java @@ -410,8 +410,10 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment @Override public void onRequestSignIn() { // 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 = - mSetupData.getAccount().getOrCreateHostAuthSend(mAppContext).mProtocol; + mSetupData.getAccount().getOrCreateHostAuthRecv(mAppContext).mProtocol; final Intent intent = AccountCredentials.getAccountCredentialsIntent(getActivity(), mUsernameView.getText().toString(), protocol); startActivityForResult(intent, SIGN_IN_REQUEST);