Added functionality to select type of certificate to be installed from the Settings app
This is part of the changes to improve the UX and language for installing certificates.
Previously, the different types of certificate used the same installation flow. This CL
introduces a new settings page, where the type of certificate to be installed can be selected.
Bug: 139173976
Test: Atest com.android.settings.security
manual testing from Settings by selecting the new certificate type
preference and ensuring the installation flow still worked as expected.
Change-Id: I48a35183cfe08e236c98f7a2b5ad498edc6d5d56
diff --git a/src/com/android/certinstaller/CertInstallerMain.java b/src/com/android/certinstaller/CertInstallerMain.java
index 7e93884..f2b19f4 100644
--- a/src/com/android/certinstaller/CertInstallerMain.java
+++ b/src/com/android/certinstaller/CertInstallerMain.java
@@ -99,27 +99,35 @@
// If bundle is empty of any actual credentials, ask user to open.
// Otherwise, pass extras to CertInstaller to install those credentials.
// Either way, we use KeyChain.EXTRA_NAME as the default name if available.
- if (bundle == null
- || bundle.isEmpty()
- || (bundle.size() == 1
- && (bundle.containsKey(KeyChain.EXTRA_NAME)
- || bundle.containsKey(Credentials.EXTRA_INSTALL_AS_UID)))) {
- final String[] mimeTypes = MIME_MAPPINGS.keySet().toArray(new String[0]);
- final Intent openIntent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
- openIntent.setType("*/*");
- openIntent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
- openIntent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, true);
- startActivityForResult(openIntent, REQUEST_OPEN_DOCUMENT);
+ if (nullOrEmptyBundle(bundle) || bundleContainsNameOnly(bundle)
+ || bundleContainsInstallAsUidOnly(bundle)
+ || bundleContainsExtraCertificateUsageOnly(bundle)) {
+ startOpenDocumentActivity();
} else {
- final Intent installIntent = new Intent(this, CertInstaller.class);
- installIntent.putExtras(intent);
- startActivityForResult(installIntent, REQUEST_INSTALL);
+ startInstallActivity(intent);
}
} else if (Intent.ACTION_VIEW.equals(action)) {
startInstallActivity(intent.getType(), intent.getData());
}
}
+ private boolean nullOrEmptyBundle(Bundle bundle) {
+ return bundle == null || bundle.isEmpty();
+ }
+
+ private boolean bundleContainsNameOnly(Bundle bundle) {
+ return bundle.size() == 1 && bundle.containsKey(KeyChain.EXTRA_NAME);
+ }
+
+ private boolean bundleContainsInstallAsUidOnly(Bundle bundle) {
+ return bundle.size() == 1 && bundle.containsKey(Credentials.EXTRA_INSTALL_AS_UID);
+ }
+
+ private boolean bundleContainsExtraCertificateUsageOnly(Bundle bundle) {
+ return bundle.size() == 1 && bundle.containsKey(Credentials.EXTRA_CERTIFICATE_USAGE);
+ }
+
+
// The maximum amount of data to read into memory before aborting.
// Without a limit, a sufficiently-large file will run us out of memory. A
// typical certificate or WiFi config is under 10k, so 10MiB should be more
@@ -146,6 +154,12 @@
return bytes.toByteArray();
}
+ private void startInstallActivity(Intent intent) {
+ final Intent installIntent = new Intent(this, CertInstaller.class);
+ installIntent.putExtras(intent);
+ startActivityForResult(installIntent, REQUEST_INSTALL);
+ }
+
private void startInstallActivity(String mimeType, Uri uri) {
if (mimeType == null) {
mimeType = getContentResolver().getType(uri);
@@ -165,7 +179,10 @@
in = getContentResolver().openInputStream(uri);
final byte[] raw = readWithLimit(in);
- startInstallActivity(target, raw);
+
+ Intent intent = new Intent(this, CertInstaller.class);
+ intent.putExtra(target, raw);
+ startInstallActivity(intent);
} catch (IOException e) {
Log.e(TAG, "Failed to read certificate: " + e);
@@ -176,13 +193,6 @@
}
}
- private void startInstallActivity(String target, byte[] value) {
- Intent intent = new Intent(this, CertInstaller.class);
- intent.putExtra(target, value);
-
- startActivityForResult(intent, REQUEST_INSTALL);
- }
-
private void startWifiInstallActivity(String mimeType, Uri uri) {
Intent intent = new Intent(this, WiFiInstaller.class);
try (BufferedInputStream in =
@@ -198,6 +208,15 @@
}
}
+ private void startOpenDocumentActivity() {
+ final String[] mimeTypes = MIME_MAPPINGS.keySet().toArray(new String[0]);
+ final Intent openIntent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+ openIntent.setType("*/*");
+ openIntent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
+ openIntent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, true);
+ startActivityForResult(openIntent, REQUEST_OPEN_DOCUMENT);
+ }
+
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_OPEN_DOCUMENT) {
