PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing settings strings.

Browse Source 
Also re-enable and fix tests.

Test: manual
Fixes: 226183482
Fixes: 218799125
Fixes: 219375624

Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
This commit is contained in:
Jonathan Scott
2022-04-11 09:49:17 +00:00
parent afe6d302e4
commit b7f4f56cad
63 changed files with 470 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/MonitoringCertInfoActivity.java
View File

@@ -16,12 +16,16 @@
package com.android.settings;
import static android.app.admin.DevicePolicyResources.Strings.Settings.DEVICE_OWNER_INSTALLED_CERTIFICATE_AUTHORITY_WARNING;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_INSTALLED_CERTIFICATE_AUTHORITY_WARNING;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.DialogInterface.OnDismissListener;
import android.content.Intent;
import android.icu.text.MessageFormat;
import android.os.Bundle;
import android.os.UserHandle;
import android.provider.Settings;
@@ -30,6 +34,10 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settingslib.RestrictedLockUtils;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
/**
* Activity that shows a dialog explaining that a CA cert is allowing someone to monitor network
* traffic. This activity should be launched for the user into which the CA cert is installed
@@ -71,12 +79,30 @@ public class MonitoringCertInfoActivity extends Activity implements OnClickListe
builder.setOnDismissListener(this);
if (dpm.getProfileOwnerAsUser(mUserId) != null) {
builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,
numberOfCertificates, dpm.getProfileOwnerNameAsUser(mUserId)));
MessageFormat msgFormat = new MessageFormat(
dpm.getResources().getString(
WORK_PROFILE_INSTALLED_CERTIFICATE_AUTHORITY_WARNING,
() -> getString(R.string.ssl_ca_cert_info_message)),
Locale.getDefault());
Map<String, Object> arguments = new HashMap<>();
arguments.put("numberOfCertificates", numberOfCertificates);
arguments.put("orgName", dpm.getProfileOwnerNameAsUser(mUserId));
builder.setMessage(msgFormat.format(arguments));
} else if (dpm.getDeviceOwnerComponentOnCallingUser() != null) {
builder.setMessage(getResources().getQuantityString(
R.plurals.ssl_ca_cert_info_message_device_owner, numberOfCertificates,
dpm.getDeviceOwnerNameOnAnyUser()));
MessageFormat msgFormat = new MessageFormat(
dpm.getResources()
.getString(DEVICE_OWNER_INSTALLED_CERTIFICATE_AUTHORITY_WARNING,
() -> getResources().getString(
R.string.ssl_ca_cert_info_message_device_owner)),
Locale.getDefault());
Map<String, Object> arguments = new HashMap<>();
arguments.put("numberOfCertificates", numberOfCertificates);
arguments.put("orgName", dpm.getDeviceOwnerNameOnAnyUser());
builder.setMessage(msgFormat.format(arguments));
} else {
// Consumer case. Show scary warning.
builder.setIcon(android.R.drawable.stat_notify_error);