diff options
author | Tony Mantler <nicoya@google.com> | 2014-06-05 13:05:42 -0700 |
---|---|---|
committer | Tony Mantler <nicoya@google.com> | 2014-06-05 13:21:08 -0700 |
commit | f765f9b976222a8a0e45d4b04883566ecf355937 (patch) | |
tree | 906d4ad21ebd442fdc841461a1404d1e6196340f /emailcommon | |
parent | 9909fabcc6cf69763f74ec4dd612d5d2aa80d324 (diff) | |
download | android_packages_apps_Email-f765f9b976222a8a0e45d4b04883566ecf355937.tar.gz android_packages_apps_Email-f765f9b976222a8a0e45d4b04883566ecf355937.tar.bz2 android_packages_apps_Email-f765f9b976222a8a0e45d4b04883566ecf355937.zip |
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
Diffstat (limited to 'emailcommon')
-rw-r--r-- | emailcommon/src/com/android/emailcommon/utility/CertificateRequestor.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/emailcommon/src/com/android/emailcommon/utility/CertificateRequestor.java b/emailcommon/src/com/android/emailcommon/utility/CertificateRequestor.java index b78895b3a..3217d0f0b 100644 --- a/emailcommon/src/com/android/emailcommon/utility/CertificateRequestor.java +++ b/emailcommon/src/com/android/emailcommon/utility/CertificateRequestor.java @@ -19,6 +19,7 @@ package com.android.emailcommon.utility; import android.app.Activity; import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.security.KeyChain; import android.security.KeyChainAliasCallback; @@ -28,14 +29,14 @@ import android.security.KeyChainAliasCallback; * a certificate to use for establishing secure connections in the Email app. */ public class CertificateRequestor extends Activity implements KeyChainAliasCallback { - - public static final String ACTION_REQUEST_CERT = "com.android.emailcommon.REQUEST_CERT"; - public static final String EXTRA_HOST = "CertificateRequestor.host"; public static final String EXTRA_PORT = "CertificateRequestor.port"; public static final String RESULT_ALIAS = "CertificateRequestor.alias"; + public static final Uri CERTIFICATE_REQUEST_URI = + Uri.parse("eas://com.android.emailcommon/certrequest"); + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -44,11 +45,13 @@ public class CertificateRequestor extends Activity implements KeyChainAliasCallb String host = i.getStringExtra(EXTRA_HOST); int port = i.getIntExtra(EXTRA_PORT, -1); - KeyChain.choosePrivateKeyAlias( - this, this, - null /* keytypes */, null /* issuers */, - host, port, - null /* alias */); + if (savedInstanceState == null) { + KeyChain.choosePrivateKeyAlias( + this, this, + null /* keytypes */, null /* issuers */, + host, port, + null /* alias */); + } } /** |