c0c75a3e96
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.
Due to concerns around users installing CA certificates without understanding the conseqences,
this CL introduces a new warning dialog when a CA certificate is installed from settings.
Bug: 139173976
Test: Atest com.android.settings.security
manual testing from Settings by selecting the certificate type
preference and ensuring the installation flow still worked as expected.
Screenshot of the screen: https://hsv.googleplex.com/5046848484016128
Change-Id: If95bffd1e68f14734fb20e8cc4b60eeb1c372358
84 lines
3.0 KiB
Java
84 lines
3.0 KiB
Java
/*
|
|
* Copyright (C) 2019 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.security;
|
|
|
|
import android.annotation.Nullable;
|
|
import android.app.Activity;
|
|
import android.content.Intent;
|
|
import android.os.Bundle;
|
|
import android.security.Credentials;
|
|
import android.view.View;
|
|
import android.widget.Toast;
|
|
|
|
import com.android.settings.R;
|
|
|
|
import com.google.android.setupcompat.template.FooterBarMixin;
|
|
import com.google.android.setupcompat.template.FooterButton;
|
|
import com.google.android.setupdesign.GlifLayout;
|
|
|
|
/**
|
|
* Creates a warning dialog explaining the consequences of installing a CA certificate
|
|
* This is displayed before a CA certificate can be installed from Settings.
|
|
*/
|
|
public class InstallCaCertificateWarning extends Activity {
|
|
|
|
@Override
|
|
public void onCreate(@Nullable Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
|
|
setContentView(R.layout.ca_certificate_warning_dialog);
|
|
final GlifLayout layout = findViewById(R.id.setup_wizard_layout);
|
|
|
|
final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
|
|
mixin.setSecondaryButton(
|
|
new FooterButton.Builder(this)
|
|
.setText(R.string.ca_certificate_warning_install_anyway)
|
|
.setListener(installCaCertificate())
|
|
.setButtonType(FooterButton.ButtonType.OTHER)
|
|
.setTheme(R.style.SudGlifButton_Secondary)
|
|
.build()
|
|
);
|
|
|
|
mixin.setPrimaryButton(
|
|
new FooterButton.Builder(this)
|
|
.setText(R.string.ca_certificate_warning_dont_install)
|
|
.setListener(returnToInstallCertificateFromStorage())
|
|
.setButtonType(FooterButton.ButtonType.NEXT)
|
|
.setTheme(R.style.SudGlifButton_Primary)
|
|
.build()
|
|
);
|
|
}
|
|
|
|
private View.OnClickListener installCaCertificate() {
|
|
return v -> {
|
|
final Intent intent = new Intent();
|
|
intent.setAction(Credentials.INSTALL_ACTION);
|
|
intent.putExtra(Credentials.EXTRA_CERTIFICATE_USAGE, Credentials.CERTIFICATE_USAGE_CA);
|
|
startActivity(intent);
|
|
finish();
|
|
};
|
|
}
|
|
|
|
private View.OnClickListener returnToInstallCertificateFromStorage() {
|
|
return v -> {
|
|
Toast.makeText(this, R.string.cert_not_installed, Toast.LENGTH_SHORT).show();
|
|
finish();
|
|
};
|
|
}
|
|
|
|
}
|