commit 12a5933af306da68f9da8a59f3da7e6cf05c1bd1
author Tony Mantler <nicoya@google.com> Sun Nov 02 18:53:48 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Nov 02 18:53:48 2014 +0000
tree 336dbd65770fc73b12e8a3716f5582e39872aef8
parent 6efb1c66d0527a4404636ba148480a0635fd282f
parent aee74ef40d1521f5301d803e9c275285d9d719ee

am aee74ef4: am f495b95d: am 67b60f66: am b57bca27: Default to encrypted connections (YAY!)

* commit 'aee74ef40d1521f5301d803e9c275285d9d719ee':
  Default to encrypted connections (YAY!)

src/com/android/email/activity/setup/AccountSetupFinal.java

diff --git a/src/com/android/email/activity/setup/AccountSetupFinal.java b/src/com/android/email/activity/setup/AccountSetupFinal.java
index a113058..adaa32a 100644
--- a/src/com/android/email/activity/setup/AccountSetupFinal.java
+++ b/src/com/android/email/activity/setup/AccountSetupFinal.java
@@ -960,22 +960,22 @@
         final String domain = emailParts[1];
 
         final Account account = mSetupData.getAccount();
+        final EmailServiceUtils.EmailServiceInfo info =
+                mSetupData.getIncomingServiceInfo(this);
 
         final HostAuth recvAuth = account.getOrCreateHostAuthRecv(this);
         recvAuth.setUserName(email);
         recvAuth.setConnection(mSetupData.getIncomingProtocol(), domain,
-                HostAuth.PORT_UNKNOWN, HostAuth.FLAG_NONE);
+                HostAuth.PORT_UNKNOWN, info.offerTls ? HostAuth.FLAG_TLS : HostAuth.FLAG_SSL);
         AccountSetupCredentialsFragment.populateHostAuthWithResults(this, recvAuth,
                 mSetupData.getCredentialResults());
         mSetupData.setIncomingCredLoaded(true);
 
-        final EmailServiceUtils.EmailServiceInfo info =
-                mSetupData.getIncomingServiceInfo(this);
         if (info.usesSmtp) {
             final HostAuth sendAuth = account.getOrCreateHostAuthSend(this);
             sendAuth.setUserName(email);
             sendAuth.setConnection(HostAuth.LEGACY_SCHEME_SMTP, domain,
-                    HostAuth.PORT_UNKNOWN, HostAuth.FLAG_NONE);
+                    HostAuth.PORT_UNKNOWN, HostAuth.FLAG_TLS);
             AccountSetupCredentialsFragment.populateHostAuthWithResults(this, sendAuth,
                     mSetupData.getCredentialResults());
             mSetupData.setOutgoingCredLoaded(true);