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

Merge "Remove credential management app Settings" into sc-dev

Browse Source
This commit is contained in:
Alex Johnston
2021-07-02 11:05:49 +00:00
committed by Android (Google) Code Review
parent 74e1408513 8d06d63fe3
commit 713d325310
9 changed files with 105 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/com/android/settings/security/CredentialManagementAppButtonsController.java
View File

@@ -16,8 +16,11 @@
package com.android.settings.security;
import android.app.Dialog;
import android.app.admin.DevicePolicyEventLogger;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.RemoteException;
@@ -25,12 +28,15 @@ import android.security.IKeyChainService;
import android.security.KeyChain;
import android.stats.devicepolicy.DevicePolicyEnums;
import android.util.Log;
import android.view.View;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.widget.ActionButtonsPreference;
import java.util.concurrent.ExecutorService;
@@ -48,9 +54,16 @@ public class CredentialManagementAppButtonsController extends BasePreferenceCont
private final Handler mHandler = new Handler(Looper.getMainLooper());
private boolean mHasCredentialManagerPackage;
private Fragment mFragment;
private final int mRemoveIcon;
public CredentialManagementAppButtonsController(Context context, String preferenceKey) {
super(context, preferenceKey);
if (context.getResources().getConfiguration().getLayoutDirection()
== View.LAYOUT_DIRECTION_RTL) {
mRemoveIcon = R.drawable.ic_redo_24;
} else {
mRemoveIcon = R.drawable.ic_undo_24;
}
}
public void setParentFragment(Fragment fragment) {
@@ -84,8 +97,8 @@ public class CredentialManagementAppButtonsController extends BasePreferenceCont
.setButton1Icon(R.drawable.ic_upload)
.setButton1OnClickListener(view -> uninstallCertificates())
.setButton2Text(R.string.remove_credential_management_app)
.setButton2Icon(R.drawable.ic_delete)
.setButton2OnClickListener(view -> removeCredentialManagementApp());
.setButton2Icon(mRemoveIcon)
.setButton2OnClickListener(view -> showRemoveCredentialManagementAppDialog());
}
}
@@ -103,18 +116,54 @@ public class CredentialManagementAppButtonsController extends BasePreferenceCont
});
}
private void removeCredentialManagementApp() {
mExecutor.execute(() -> {
try {
IKeyChainService service = KeyChain.bind(mContext).getService();
service.removeCredentialManagementApp();
DevicePolicyEventLogger
.createEvent(DevicePolicyEnums.CREDENTIAL_MANAGEMENT_APP_REMOVED)
.write();
mFragment.getActivity().finish();
} catch (InterruptedException | RemoteException e) {
Log.e(TAG, "Unable to remove the credential management app");
}
});
private void showRemoveCredentialManagementAppDialog() {
final RemoveCredentialManagementAppDialog dialog =
RemoveCredentialManagementAppDialog.newInstance();
dialog.show(mFragment.getParentFragmentManager(),
RemoveCredentialManagementAppDialog.class.getName());
}
}
/**
* Implements an AlertDialog for confirming that a user wants to remove the credential
* management app. The app will no longer be able to manage certificates, but it will stay on
* the device. All certificates installed by the credential management app will be uninstalled.
*/
public static class RemoveCredentialManagementAppDialog extends InstrumentedDialogFragment {
public static RemoveCredentialManagementAppDialog newInstance() {
return new RemoveCredentialManagementAppDialog();
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getContext(), R.style.Theme_AlertDialog)
.setTitle(R.string.remove_credential_management_app_dialog_title)
.setMessage(R.string.remove_credential_management_app_dialog_message)
.setPositiveButton(R.string.remove_credential_management_app,
(dialog, which) -> removeCredentialManagementApp())
.setNegativeButton(R.string.cancel, (dialog, which) -> dismiss())
.create();
}
private void removeCredentialManagementApp() {
final ExecutorService executor = Executors.newSingleThreadExecutor();
executor.execute(() -> {
try {
IKeyChainService service = KeyChain.bind(getContext()).getService();
service.removeCredentialManagementApp();
DevicePolicyEventLogger
.createEvent(DevicePolicyEnums.CREDENTIAL_MANAGEMENT_APP_REMOVED)
.write();
getParentFragment().getActivity().finish();
} catch (InterruptedException | RemoteException e) {
Log.e(TAG, "Unable to remove the credential management app");
}
});
}
@Override
public int getMetricsCategory() {
return SettingsEnums.CREDENTIAL_MANAGEMENT_APP_REMOVE_APP;
}
}
}

2
src/com/android/settings/security/RequestManageCredentials.java
View File

@@ -288,7 +288,7 @@ public class RequestManageCredentials extends Activity {
// On down scroll, hide text in floating action button by setting
// extended to false.
if (dy > 0 && mExtendedFab.getVisibility() == View.VISIBLE) {
mExtendedFab.setExtended(false);
mExtendedFab.shrink();
}
if (isRecyclerScrollable()) {
mExtendedFab.show();