Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caa8877f authored by Victor Chang's avatar Victor Chang
Browse files

Show trust option for multiple unapproved cert in chain 

- Add a argument to pass user id
- Check approval status of certs in WorkerThread

Bug: 18224038
Change-Id: I5fd6a41e9593d0f339fecb4185331175e32c50c2
parent d7d0e1b6

src/com/android/settings/MonitoringCertInfoActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.DialogInterface.OnClickListener; 
import android.content.Intent;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.UserHandle;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;
@@ -88,6 +89,8 @@ public class MonitoringCertInfoActivity extends Activity implements OnClickListe 
            Intent intent =

                    new Intent(android.provider.Settings.ACTION_TRUSTED_CREDENTIALS_USER);

            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);

            intent.putExtra(TrustedCredentialsSettings.ARG_SHOW_NEW_FOR_USER,

                    UserHandle.myUserId());

            startActivity(intent);

            finish();

        }

src/com/android/settings/TrustedCredentialsSettings.java

+61 −0
Original line number Diff line number Diff line
@@ -16,9 +16,12 @@ 


package com.android.settings;



import android.annotation.UiThread;

import android.app.KeyguardManager;

import android.app.admin.DevicePolicyManager;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.UserInfo;
@@ -61,10 +64,14 @@ import java.util.List; 
public class TrustedCredentialsSettings extends OptionsMenuFragment

        implements TrustedCredentialsDialogBuilder.DelegateInterface {



    public static final String ARG_SHOW_NEW_FOR_USER = "ARG_SHOW_NEW_FOR_USER";



    private static final String TAG = "TrustedCredentialsSettings";



    private UserManager mUserManager;

    private KeyguardManager mKeyguardManager;

    private int mTrustAllCaUserId;





    private static final String USER_ACTION = "com.android.settings.TRUSTED_CREDENTIALS_USER";
@@ -181,6 +188,9 @@ public class TrustedCredentialsSettings extends OptionsMenuFragment 
        mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);

        mKeyguardManager = (KeyguardManager) getActivity()

                .getSystemService(Context.KEYGUARD_SERVICE);

        mTrustAllCaUserId = getActivity().getIntent().getIntExtra(ARG_SHOW_NEW_FOR_USER,

                UserHandle.USER_NULL);



        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE);

        filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE);
@@ -558,6 +568,37 @@ public class TrustedCredentialsSettings extends OptionsMenuFragment 
                mList.setVisibility(View.VISIBLE);

                mProgressBar.setProgress(0);

                mAliasLoaders.remove(mTab);

                showTrustAllCaDialogIfNeeded();

            }



            private boolean isUserTabAndTrustAllCertMode() {

                return isTrustAllCaCertModeInProgress() && mTab == Tab.USER;

            }



            @UiThread

            private void showTrustAllCaDialogIfNeeded() {

                if (!isUserTabAndTrustAllCertMode()) {

                    return;

                }

                List<CertHolder> certHolders = mCertHoldersByUserId.get(mTrustAllCaUserId);

                if (certHolders == null) {

                    return;

                }



                List<CertHolder> unapprovedUserCertHolders = new ArrayList<>();

                final DevicePolicyManager dpm = mContext.getSystemService(

                        DevicePolicyManager.class);

                for (CertHolder cert : certHolders) {

                    if (cert != null && !dpm.isCaCertApproved(cert.mAlias, mTrustAllCaUserId)) {

                        unapprovedUserCertHolders.add(cert);

                    }

                }



                if (unapprovedUserCertHolders.size() == 0) {

                    Log.w(TAG, "no cert is pending approval for user " + mTrustAllCaUserId);

                    return;

                }

                showTrustAllCaDialog(unapprovedUserCertHolders);

            }

        }
@@ -700,6 +741,26 @@ public class TrustedCredentialsSettings extends OptionsMenuFragment 
        private Switch mSwitch;

    }



    private boolean isTrustAllCaCertModeInProgress() {

        return mTrustAllCaUserId != UserHandle.USER_NULL;

    }



    private void showTrustAllCaDialog(List<CertHolder> unapprovedCertHolders) {

        final CertHolder[] arr = unapprovedCertHolders.toArray(

                new CertHolder[unapprovedCertHolders.size()]);

        new TrustedCredentialsDialogBuilder(getActivity(), this)

                .setCertHolders(arr)

                .setOnDismissListener(new DialogInterface.OnDismissListener() {

                    @Override

                    public void onDismiss(DialogInterface dialogInterface) {

                        // Avoid starting dialog again after Activity restart.

                        getActivity().getIntent().removeExtra(ARG_SHOW_NEW_FOR_USER);

                        mTrustAllCaUserId = UserHandle.USER_NULL;

                    }

                })

                .show();

    }



    private void showCertDialog(final CertHolder certHolder) {

        new TrustedCredentialsDialogBuilder(getActivity(), this)

                .setCertHolder(certHolder)