summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Mantler <nicoya@google.com>2014-09-11 13:22:02 -0700
committerTony Mantler <nicoya@google.com>2014-09-11 13:22:02 -0700
commitb38d0bbf8dff7e0b8fb8d0c2ae526360c30a72c5 (patch)
tree2dffe651b835cb1c373071515a4b7527ddfdf282 /src
parentf866891f92dd01df6694302490212ccf4f8f4b31 (diff)
downloadandroid_packages_apps_Email-b38d0bbf8dff7e0b8fb8d0c2ae526360c30a72c5.tar.gz
android_packages_apps_Email-b38d0bbf8dff7e0b8fb8d0c2ae526360c30a72c5.tar.bz2
android_packages_apps_Email-b38d0bbf8dff7e0b8fb8d0c2ae526360c30a72c5.zip
Use correct password dialog for outgoing settings
We actually want to divert based on incoming protocol, not outgoing b/17460124 Change-Id: Ic7129d23d36f9f15e2ecbb25d3f11dae12bb56ac
Diffstat (limited to 'src')
-rw-r--r--src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java4
1 files changed, 3 insertions, 1 deletions
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);