Separate FingerprintHelper and AuthDialog

2025-10-16 01:00:47 +00:00 · 2019-01-31 00:05:59 -05:00
parent cfb0a3ba2a
commit 4091687733
8 changed files with 103 additions and 71 deletions
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -5,7 +5,6 @@

    <uses-permission android:name="android.permission.VIBRATE" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

    <application
--- a/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
+++ b/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
@@ -148,7 +148,7 @@ public class SuRequestActivity extends BaseActivity {
            }
        };

-        boolean useFP = FingerprintHelper.useFingerPrint();
+        boolean useFP = FingerprintHelper.useFingerprint();

        if (useFP) {
            try {
--- a/app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
+++ b/app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
@@ -15,6 +15,7 @@ import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.database.MagiskDB;
 import com.topjohnwu.magisk.dialogs.CustomAlertDialog;
+import com.topjohnwu.magisk.dialogs.FingerprintAuthDialog;
 import com.topjohnwu.magisk.uicomponents.ExpandableViewHolder;
 import com.topjohnwu.magisk.uicomponents.SnackbarMaker;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
@@ -85,12 +86,12 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
                    dbHelper.updatePolicy(policy);
                }
            };
-            if (FingerprintHelper.useFingerPrint()) {
+            if (FingerprintHelper.useFingerprint()) {
                holder.masterSwitch.setChecked(!isChecked);
-                FingerprintHelper.showAuthDialog((Activity) v.getContext(), () -> {
+                new FingerprintAuthDialog((Activity) v.getContext(), () -> {
                    holder.masterSwitch.setChecked(isChecked);
                    r.run();
-                });
+                }).show();
            } else {
                r.run();
            }
--- a/app/src/full/java/com/topjohnwu/magisk/dialogs/CustomAlertDialog.java
+++ b/app/src/full/java/com/topjohnwu/magisk/dialogs/CustomAlertDialog.java
@@ -22,9 +22,9 @@ public class CustomAlertDialog extends AlertDialog.Builder {
    private DialogInterface.OnClickListener positiveListener;
    private DialogInterface.OnClickListener negativeListener;
    private DialogInterface.OnClickListener neutralListener;
-    private AlertDialog dialog;

-    private ViewHolder vh;
+    protected AlertDialog dialog;
+    protected ViewHolder vh;

    public class ViewHolder {
        @BindView(R.id.dialog_layout) public LinearLayout dialogLayout;
--- a/app/src/full/java/com/topjohnwu/magisk/dialogs/FingerprintAuthDialog.java
+++ b/app/src/full/java/com/topjohnwu/magisk/dialogs/FingerprintAuthDialog.java
@@ -0,0 +1,88 @@
+package com.topjohnwu.magisk.dialogs;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.Build;
+import android.view.Gravity;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
+import com.topjohnwu.magisk.utils.Utils;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
+@TargetApi(Build.VERSION_CODES.M)
+public class FingerprintAuthDialog extends CustomAlertDialog {
+
+    private Runnable callback;
+    private DialogFingerprintHelper helper;
+
+    public FingerprintAuthDialog(@NonNull Activity activity, Runnable onSuccess) {
+        super(activity);
+        callback = onSuccess;
+        Drawable fingerprint = activity.getResources().getDrawable(R.drawable.ic_fingerprint);
+        fingerprint.setBounds(0, 0, Utils.dpInPx(50), Utils.dpInPx(50));
+        Resources.Theme theme = activity.getTheme();
+        TypedArray ta = theme.obtainStyledAttributes(new int[] {R.attr.imageColorTint});
+        fingerprint.setTint(ta.getColor(0, Color.GRAY));
+        ta.recycle();
+        vh.messageView.setCompoundDrawables(null, null, null, fingerprint);
+        vh.messageView.setCompoundDrawablePadding(Utils.dpInPx(20));
+        vh.messageView.setGravity(Gravity.CENTER);
+        setMessage(R.string.auth_fingerprint);
+        setNegativeButton(R.string.close, (d, w) -> helper.cancel());
+        setOnCancelListener(d -> helper.cancel());
+        try {
+            helper = new DialogFingerprintHelper();
+        } catch (Exception ignored) {}
+    }
+
+    @Override
+    public AlertDialog show() {
+        create();
+        if (helper == null) {
+            dialog.dismiss();
+            Utils.toast(R.string.auth_fail, Toast.LENGTH_SHORT);
+        } else {
+            helper.authenticate();
+            dialog.show();
+        }
+        return dialog;
+    }
+
+    class DialogFingerprintHelper extends FingerprintHelper {
+
+        DialogFingerprintHelper() throws Exception {}
+
+        @Override
+        public void onAuthenticationError(int errorCode, CharSequence errString) {
+            vh.messageView.setTextColor(Color.RED);
+            vh.messageView.setText(errString);
+        }
+
+        @Override
+        public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
+            vh.messageView.setTextColor(Color.RED);
+            vh.messageView.setText(helpString);
+        }
+
+        @Override
+        public void onAuthenticationFailed() {
+            vh.messageView.setTextColor(Color.RED);
+            vh.messageView.setText(R.string.auth_fail);
+        }
+
+        @Override
+        public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+            dismiss();
+            callback.run();
+        }
+    }
+}
--- a/app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
+++ b/app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
@@ -13,6 +13,7 @@ import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.BasePreferenceFragment;
+import com.topjohnwu.magisk.dialogs.FingerprintAuthDialog;
 import com.topjohnwu.magisk.tasks.CheckUpdates;
 import com.topjohnwu.magisk.utils.AppUtils;
 import com.topjohnwu.magisk.utils.DownloadApp;
@@ -46,7 +47,7 @@ public class SettingsFragment extends BasePreferenceFragment implements Topic.Su

        boolean showSuperuser = Utils.showSuperUser();
        app.prefs.edit()
-                .putBoolean(Config.Key.SU_FINGERPRINT, FingerprintHelper.useFingerPrint())
+                .putBoolean(Config.Key.SU_FINGERPRINT, FingerprintHelper.useFingerprint())
                .apply();

        PreferenceScreen prefScreen = getPreferenceScreen();
@@ -217,10 +218,10 @@ public class SettingsFragment extends BasePreferenceFragment implements Topic.Su
            case Config.Key.SU_FINGERPRINT:
                boolean checked = ((SwitchPreferenceCompat) preference).isChecked();
                ((SwitchPreferenceCompat) preference).setChecked(!checked);
-                FingerprintHelper.showAuthDialog(requireActivity(), () -> {
+                new FingerprintAuthDialog(requireActivity(), () -> {
                    ((SwitchPreferenceCompat) preference).setChecked(checked);
                    Config.set(key, checked);
-                });
+                }).show();
                break;
        }
        return true;
--- a/app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java
+++ b/app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java
@@ -1,182 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.app.KeyguardManager;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.Build;
-import android.os.CancellationSignal;
-import android.security.keystore.KeyGenParameterSpec;
-import android.security.keystore.KeyPermanentlyInvalidatedException;
-import android.security.keystore.KeyProperties;
-import android.view.Gravity;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.App;
-import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.dialogs.CustomAlertDialog;
-
-import java.security.KeyStore;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-
-@TargetApi(Build.VERSION_CODES.M)
-public abstract class FingerprintHelper {
-
-    private FingerprintManager manager;
-    private Cipher cipher;
-    private CancellationSignal cancel;
-
-    public static boolean useFingerPrint() {
-        boolean fp = Config.get(Config.Key.SU_FINGERPRINT);
-        if (fp && !canUseFingerprint()) {
-            Config.set(Config.Key.SU_FINGERPRINT, false);
-            fp = false;
-        }
-        return fp;
-    }
-
-    public static boolean canUseFingerprint() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
-            return false;
-        KeyguardManager km = App.self.getSystemService(KeyguardManager.class);
-        FingerprintManager fm = App.self.getSystemService(FingerprintManager.class);
-        return km.isKeyguardSecure() && fm != null && fm.isHardwareDetected() && fm.hasEnrolledFingerprints();
-    }
-
-    public static void showAuthDialog(Activity activity, Runnable onSuccess) {
-        CustomAlertDialog dialog = new CustomAlertDialog(activity);
-        CustomAlertDialog.ViewHolder vh = dialog.getViewHolder();
-        try {
-            FingerprintHelper helper = new FingerprintHelper() {
-                @Override
-                public void onAuthenticationError(int errorCode, CharSequence errString) {
-                    vh.messageView.setTextColor(Color.RED);
-                    vh.messageView.setText(errString);
-                }
-
-                @Override
-                public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
-                    vh.messageView.setTextColor(Color.RED);
-                    vh.messageView.setText(helpString);
-                }
-
-                @Override
-                public void onAuthenticationFailed() {
-                    vh.messageView.setTextColor(Color.RED);
-                    vh.messageView.setText(R.string.auth_fail);
-                }
-
-                @Override
-                public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
-                    dialog.dismiss();
-                    onSuccess.run();
-                }
-            };
-            Drawable fingerprint = activity.getResources().getDrawable(R.drawable.ic_fingerprint);
-            fingerprint.setBounds(0, 0, Utils.dpInPx(50), Utils.dpInPx(50));
-            Resources.Theme theme = activity.getTheme();
-            TypedArray ta = theme.obtainStyledAttributes(new int[] {R.attr.imageColorTint});
-            fingerprint.setTint(ta.getColor(0, Color.GRAY));
-            ta.recycle();
-            vh.messageView.setCompoundDrawables(null, null, null, fingerprint);
-            vh.messageView.setCompoundDrawablePadding(Utils.dpInPx(20));
-            vh.messageView.setGravity(Gravity.CENTER);
-            dialog.setMessage(R.string.auth_fingerprint)
-                    .setNegativeButton(R.string.close, (d, w) -> helper.cancel())
-                    .setOnCancelListener(d -> helper.cancel())
-                    .show();
-            helper.authenticate();
-        } catch (Exception e) {
-            e.printStackTrace();
-            Utils.toast(R.string.auth_fail, Toast.LENGTH_SHORT);
-        }
-
-    }
-
-    protected FingerprintHelper() throws Exception {
-        KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore");
-        manager = App.self.getSystemService(FingerprintManager.class);
-        cipher = Cipher.getInstance(KeyProperties.KEY_ALGORITHM_AES + "/"
-                + KeyProperties.BLOCK_MODE_CBC + "/"
-                + KeyProperties.ENCRYPTION_PADDING_PKCS7);
-        keyStore.load(null);
-        SecretKey key = (SecretKey) keyStore.getKey(Const.SU_KEYSTORE_KEY, null);
-        if (key == null) {
-            key = generateKey();
-        }
-        try {
-            cipher.init(Cipher.ENCRYPT_MODE, key);
-        } catch (KeyPermanentlyInvalidatedException e) {
-            // Only happens on Marshmallow
-            key = generateKey();
-            cipher.init(Cipher.ENCRYPT_MODE, key);
-        }
-    }
-
-    public abstract void onAuthenticationError(int errorCode, CharSequence errString);
-
-    public abstract void onAuthenticationHelp(int helpCode, CharSequence helpString);
-
-    public abstract void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result);
-
-    public abstract void onAuthenticationFailed();
-
-    public void authenticate() {
-        cancel = new CancellationSignal();
-        FingerprintManager.CryptoObject cryptoObject = new FingerprintManager.CryptoObject(cipher);
-        manager.authenticate(cryptoObject, cancel, 0, new Callback(), null);
-    }
-
-    public void cancel() {
-        if (cancel != null)
-            cancel.cancel();
-    }
-
-    private SecretKey generateKey() throws Exception {
-        KeyGenerator keygen = KeyGenerator
-                .getInstance(KeyProperties.KEY_ALGORITHM_AES, "AndroidKeyStore");
-        KeyGenParameterSpec.Builder builder = new KeyGenParameterSpec.Builder(
-                Const.SU_KEYSTORE_KEY,
-                KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT)
-                .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
-                .setUserAuthenticationRequired(true)
-                .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            builder.setInvalidatedByBiometricEnrollment(false);
-        }
-        keygen.init(builder.build());
-        return keygen.generateKey();
-    }
-
-    private class Callback extends FingerprintManager.AuthenticationCallback {
-        @Override
-        public void onAuthenticationError(int errorCode, CharSequence errString) {
-            FingerprintHelper.this.onAuthenticationError(errorCode, errString);
-        }
-
-        @Override
-        public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
-            FingerprintHelper.this.onAuthenticationHelp(helpCode, helpString);
-        }
-
-        @Override
-        public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
-            FingerprintHelper.this.onAuthenticationSucceeded(result);
-        }
-
-        @Override
-        public void onAuthenticationFailed() {
-            FingerprintHelper.this.onAuthenticationFailed();
-        }
-    }
-}