Clean up cert activity handling

Fix re-displaying the dialog on orientation change b/5622284
Add host/port when available b/4988512
Disambiguate intent between AOSP and EmailGoogle

Change-Id: Ideeda20dfd9bd0070998ccf42d8042765866ca0e

2 files changed, 13 insertions, 6 deletions

diff --git a/src/com/android/email/activity/setup/AccountSetupCredentialsFragment.java b/src/com/android/email/activity/setup/AccountSetupCredentialsFragment.java
index 9cfb9c89b..82106434f 100644
--- a/src/com/android/email/activity/setup/AccountSetupCredentialsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupCredentialsFragment.java
@@ -18,7 +18,6 @@ package com.android.email.activity.setup;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -354,8 +353,10 @@ public class AccountSetupCredentialsFragment extends AccountSetupFragment
 
     @Override
     public void onCertificateRequested() {
-        final Intent intent = new Intent(CertificateRequestor.ACTION_REQUEST_CERT);
-        intent.setData(Uri.parse("eas://com.android.emailcommon/certrequest"));
+        final Intent intent = new Intent(getString(R.string.intent_exchange_cert_action));
+        intent.setData(CertificateRequestor.CERTIFICATE_REQUEST_URI);
+        // We don't set EXTRA_HOST or EXTRA_PORT here because we don't know the final host/port
+        // that we're connecting to yet, and autodiscover might point us somewhere else
         startActivityForResult(intent, CERTIFICATE_REQUEST);
     }
 }
diff --git a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
index eb0a1a9ad..bfd647cba 100644
--- a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
@@ -20,7 +20,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.Loader;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.text.Editable;
@@ -611,8 +610,15 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment
 
     @Override
     public void onCertificateRequested() {
-        final Intent intent = new Intent(CertificateRequestor.ACTION_REQUEST_CERT);
-        intent.setData(Uri.parse("eas://com.android.emailcommon/certrequest"));
+        final Intent intent = new Intent(getString(R.string.intent_exchange_cert_action));
+        intent.setData(CertificateRequestor.CERTIFICATE_REQUEST_URI);
+        intent.putExtra(CertificateRequestor.EXTRA_HOST, mServerView.getText().toString().trim());
+        try {
+            intent.putExtra(CertificateRequestor.EXTRA_PORT,
+                    Integer.parseInt(mPortView.getText().toString().trim()));
+        } catch (final NumberFormatException e) {
+            LogUtils.d(LogUtils.TAG, "Couldn't parse port %s", mPortView.getText());
+        }
         startActivityForResult(intent, CERTIFICATE_REQUEST);
     }