Support using BiometricPrompt

2025-12-30 23:48:31 +00:00 · 2019-11-14 05:42:39 -05:00
parent 576efbdc1b
commit b29f0ca4d1
47 changed files with 146 additions and 456 deletions
--- a/app/src/main/java/com/topjohnwu/magisk/Config.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/Config.kt
@@ -11,9 +11,8 @@ import com.topjohnwu.magisk.data.repository.DBConfig
 import com.topjohnwu.magisk.di.Protected
 import com.topjohnwu.magisk.extensions.get
 import com.topjohnwu.magisk.extensions.inject
-import com.topjohnwu.magisk.extensions.packageName
 import com.topjohnwu.magisk.model.preference.PreferenceModel
-import com.topjohnwu.magisk.utils.FingerprintHelper
+import com.topjohnwu.magisk.utils.BiometricHelper
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.io.SuFile
@@ -32,7 +31,7 @@ object Config : PreferenceModel, DBConfig {
        const val ROOT_ACCESS = "root_access"
        const val SU_MULTIUSER_MODE = "multiuser_mode"
        const val SU_MNT_NS = "mnt_ns"
-        const val SU_FINGERPRINT = "su_fingerprint"
+        const val SU_BIOMETRIC = "su_biometric"
        const val SU_MANAGER = "requester"
        const val KEYSTORE = "keystore"

@@ -127,7 +126,7 @@ object Config : PreferenceModel, DBConfig {
    var rootMode by dbSettings(Key.ROOT_ACCESS, Value.ROOT_ACCESS_APPS_AND_ADB)
    var suMntNamespaceMode by dbSettings(Key.SU_MNT_NS, Value.NAMESPACE_MODE_REQUESTER)
    var suMultiuserMode by dbSettings(Key.SU_MULTIUSER_MODE, Value.MULTIUSER_MODE_OWNER_ONLY)
-    var suFingerprint by dbSettings(Key.SU_FINGERPRINT, false)
+    var suBiometric by dbSettings(Key.SU_BIOMETRIC, false)
    var suManager by dbStrings(Key.SU_MANAGER, "", true)
    var keyStoreRaw by dbStrings(Key.KEYSTORE, "", true)

@@ -135,9 +134,18 @@ object Config : PreferenceModel, DBConfig {
    val downloadDirectory get() =
        Utils.ensureDownloadPath(downloadPath) ?: get<Context>().getExternalFilesDir(null)!!

-    fun initialize() = prefs.edit {
+    private const val SU_FINGERPRINT = "su_fingerprint"
+
+    fun initialize() = prefs.also {
+        if (it.getBoolean(SU_FINGERPRINT, false)) {
+            suBiometric = true
+        }
+    }.edit {
        parsePrefs(this)

+        // Legacy stuff
+        remove(SU_FINGERPRINT)
+
        // Get actual state
        putBoolean(Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())

@@ -145,7 +153,7 @@ object Config : PreferenceModel, DBConfig {
        putString(Key.ROOT_ACCESS, rootMode.toString())
        putString(Key.SU_MNT_NS, suMntNamespaceMode.toString())
        putString(Key.SU_MULTIUSER_MODE, suMultiuserMode.toString())
-        putBoolean(Key.SU_FINGERPRINT, FingerprintHelper.useFingerprint())
+        putBoolean(Key.SU_BIOMETRIC, BiometricHelper.isEnabled)
    }.also {
        if (!prefs.contains(Key.UPDATE_CHANNEL))
            prefs.edit().putString(Key.UPDATE_CHANNEL, defaultChannel.toString()).apply()
@@ -154,7 +162,7 @@ object Config : PreferenceModel, DBConfig {
    private fun parsePrefs(editor: SharedPreferences.Editor) = editor.apply {
        val config = SuFile.open("/data/adb", Const.MANAGER_CONFIGS)
        if (config.exists()) runCatching {
-            val input = SuFileInputStream(config).buffered()
+            val input = SuFileInputStream(config)
            val parser = Xml.newPullParser()
            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false)
            parser.setInput(input, "UTF-8")
@@ -205,9 +213,10 @@ object Config : PreferenceModel, DBConfig {
    fun export() {
        // Flush prefs to disk
        prefs.edit().commit()
+        val context = get<Context>(Protected)
        val xml = File(
-            "${get<Context>(Protected).filesDir.parent}/shared_prefs",
-            "${packageName}_preferences.xml"
+            "${context.filesDir.parent}/shared_prefs",
+            "${context.packageName}_preferences.xml"
        )
        Shell.su("cat $xml > /data/adb/${Const.MANAGER_CONFIGS}").exec()
    }
--- a/app/src/main/java/com/topjohnwu/magisk/base/viewmodel/BaseViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/base/viewmodel/BaseViewModel.kt
@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.base.viewmodel

-import android.app.Activity
+import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.extensions.doOnSubscribeUi
 import com.topjohnwu.magisk.model.events.BackPressEvent
 import com.topjohnwu.magisk.model.events.PermissionEvent
@@ -21,7 +21,7 @@ abstract class BaseViewModel(
        }
    }

-    fun withView(action: Activity.() -> Unit) {
+    fun withView(action: BaseActivity<*, *>.() -> Unit) {
        ViewActionEvent(action).publish()
    }

--- a/app/src/main/java/com/topjohnwu/magisk/data/repository/DBConfig.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/data/repository/DBConfig.kt
@@ -29,8 +29,8 @@ interface DBConfig {
 }

 class DBSettingsValue(
-        private val name: String,
-        private val default: Int
+    private val name: String,
+    private val default: Int
 ) : ReadWriteProperty<DBConfig, Int> {

    private var value: Int? = null
@@ -47,29 +47,29 @@ class DBSettingsValue(
            this.value = value
        }
        thisRef.settingsDao.put(name, value)
-                .subscribeOn(Schedulers.io())
-                .subscribe()
+            .subscribeOn(Schedulers.io())
+            .subscribe()
    }
 }

 class DBBoolSettings(
-        name: String,
-        default: Boolean
+    name: String,
+    default: Boolean
 ) : ReadWriteProperty<DBConfig, Boolean> {

    val base = DBSettingsValue(name, if (default) 1 else 0)

-    override fun getValue(thisRef: DBConfig, property: KProperty<*>): Boolean
-            = base.getValue(thisRef, property) != 0
+    override fun getValue(thisRef: DBConfig, property: KProperty<*>): Boolean =
+        base.getValue(thisRef, property) != 0

    override fun setValue(thisRef: DBConfig, property: KProperty<*>, value: Boolean) =
-            base.setValue(thisRef, property, if (value) 1 else 0)
+        base.setValue(thisRef, property, if (value) 1 else 0)
 }

 class DBStringsValue(
-        private val name: String,
-        private val default: String,
-        private val sync: Boolean
+    private val name: String,
+    private val default: String,
+    private val sync: Boolean
 ) : ReadWriteProperty<DBConfig, String> {

    private var value: String? = null
@@ -90,16 +90,16 @@ class DBStringsValue(
                thisRef.stringDao.delete(name).blockingAwait()
            } else {
                thisRef.stringDao.delete(name)
-                        .subscribeOn(Schedulers.io())
-                        .subscribe()
+                    .subscribeOn(Schedulers.io())
+                    .subscribe()
            }
        } else {
            if (sync) {
                thisRef.stringDao.put(name, value).blockingAwait()
            } else {
                thisRef.stringDao.put(name, value)
-                        .subscribeOn(Schedulers.io())
-                        .subscribe()
+                    .subscribeOn(Schedulers.io())
+                    .subscribe()
            }
        }
    }
--- a/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.model.events

-import android.app.Activity
+import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.model.entity.module.Repo
 import io.reactivex.subjects.PublishSubject

@@ -28,7 +28,7 @@ class EnvFixEvent : ViewEvent()

 class UpdateSafetyNetEvent : ViewEvent()

-class ViewActionEvent(val action: Activity.() -> Unit) : ViewEvent()
+class ViewActionEvent(val action: BaseActivity<*, *>.() -> Unit) : ViewEvent()

 class OpenFilePickerEvent : ViewEvent()

--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
@@ -24,7 +24,6 @@ import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.observer.Observer
 import com.topjohnwu.magisk.utils.*
-import com.topjohnwu.magisk.view.dialogs.FingerprintAuthDialog
 import com.topjohnwu.superuser.Shell
 import io.reactivex.Completable
 import org.koin.android.ext.android.inject
@@ -61,7 +60,7 @@ class SettingsFragment : BasePreferenceFragment() {
        multiuserConfig = findPreference(Config.Key.SU_MULTIUSER_MODE)!!
        nsConfig = findPreference(Config.Key.SU_MNT_NS)!!
        val reauth = findPreference<SwitchPreferenceCompat>(Config.Key.SU_REAUTH)!!
-        val fingerprint = findPreference<SwitchPreferenceCompat>(Config.Key.SU_FINGERPRINT)!!
+        val biometric = findPreference<SwitchPreferenceCompat>(Config.Key.SU_BIOMETRIC)!!
        val generalCatagory = findPreference<PreferenceCategory>("general")!!
        val magiskCategory = findPreference<PreferenceCategory>("magisk")!!
        val suCategory = findPreference<PreferenceCategory>("superuser")!!
@@ -88,11 +87,11 @@ class SettingsFragment : BasePreferenceFragment() {
            suCategory.removePreference(reauth)
        }

-        // Disable fingerprint option if not possible
-        if (!FingerprintHelper.canUseFingerprint()) {
-            fingerprint.isEnabled = false
-            fingerprint.isChecked = false
-            fingerprint.setSummary(R.string.disable_fingerprint)
+        // Disable biometric option if not possible
+        if (!BiometricHelper.isSupported) {
+            biometric.isEnabled = false
+            biometric.isChecked = false
+            biometric.setSummary(R.string.no_biometric)
        }

        if (Const.USER_ID == 0 && Info.isConnected.value && Shell.rootAccess()) {
@@ -208,13 +207,13 @@ class SettingsFragment : BasePreferenceFragment() {

    override fun onPreferenceTreeClick(preference: Preference): Boolean {
        when (preference.key) {
-            Config.Key.SU_FINGERPRINT -> {
+            Config.Key.SU_BIOMETRIC -> {
                val checked = (preference as SwitchPreferenceCompat).isChecked
                preference.isChecked = !checked
-                FingerprintAuthDialog(requireActivity()) {
+                BiometricHelper.authenticate(requireActivity()) {
                    preference.isChecked = checked
-                    Config.suFingerprint = checked
-                }.show()
+                    Config.suBiometric = checked
+                }
            }
        }
        return true
--- a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
@@ -15,11 +15,10 @@ import com.topjohnwu.magisk.model.entity.recycler.PolicyRvItem
 import com.topjohnwu.magisk.model.events.PolicyEnableEvent
 import com.topjohnwu.magisk.model.events.PolicyUpdateEvent
 import com.topjohnwu.magisk.model.events.SnackbarEvent
+import com.topjohnwu.magisk.utils.BiometricHelper
 import com.topjohnwu.magisk.utils.DiffObservableList
-import com.topjohnwu.magisk.utils.FingerprintHelper
 import com.topjohnwu.magisk.utils.RxBus
 import com.topjohnwu.magisk.view.dialogs.CustomAlertDialog
-import com.topjohnwu.magisk.view.dialogs.FingerprintAuthDialog
 import io.reactivex.Single
 import io.reactivex.disposables.Disposable
 import me.tatarka.bindingcollectionadapter2.ItemBinding
@@ -83,8 +82,8 @@ class SuperuserViewModel(
            .add()

        withView {
-            if (FingerprintHelper.useFingerprint()) {
-                FingerprintAuthDialog(this) { updateState() }.show()
+            if (BiometricHelper.isEnabled) {
+                BiometricHelper.authenticate(this) { updateState() }
            } else {
                CustomAlertDialog(this)
                    .setTitle(R.string.su_revoke_title)
@@ -131,12 +130,12 @@ class SuperuserViewModel(
                .add()
        }

-        if (FingerprintHelper.useFingerprint()) {
+        if (BiometricHelper.isEnabled) {
            withView {
-                FingerprintAuthDialog(this, { updateState() }, {
+                BiometricHelper.authenticate(this, onError = {
                    ignoreNext = item
                    item.isEnabled.toggle()
-                }).show()
+                }) { updateState() }
            }
        } else {
            updateState()
--- a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
@@ -9,6 +9,7 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.databinding.ActivityRequestBinding
 import com.topjohnwu.magisk.model.events.DieEvent
+import com.topjohnwu.magisk.model.events.ViewActionEvent
 import com.topjohnwu.magisk.model.events.ViewEvent
 import com.topjohnwu.magisk.utils.SuHandler
 import com.topjohnwu.magisk.utils.SuHandler.REQUEST
@@ -56,6 +57,7 @@ open class SuRequestActivity : BaseActivity<SuRequestViewModel, ActivityRequestB
    override fun onEventDispatched(event: ViewEvent) {
        super.onEventDispatched(event)
        when (event) {
+            is ViewActionEvent -> event.action(this)
            is DieEvent -> finish()
        }
    }
--- a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.content.res.Resources
 import android.graphics.drawable.Drawable
-import android.hardware.fingerprint.FingerprintManager
 import android.os.CountDownTimer
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.Config
@@ -19,8 +18,8 @@ import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.entity.recycler.SpinnerRvItem
 import com.topjohnwu.magisk.model.entity.toPolicy
 import com.topjohnwu.magisk.model.events.DieEvent
+import com.topjohnwu.magisk.utils.BiometricHelper
 import com.topjohnwu.magisk.utils.DiffObservableList
-import com.topjohnwu.magisk.utils.FingerprintHelper
 import com.topjohnwu.magisk.utils.KObservableField
 import com.topjohnwu.magisk.utils.SuConnector
 import me.tatarka.bindingcollectionadapter2.BindingListViewAdapter
@@ -43,7 +42,6 @@ class SuRequestViewModel(
    val denyText = KObservableField(resources.getString(R.string.deny))
    val warningText = KObservableField<CharSequence>(resources.getString(R.string.su_warning))

-    val canUseFingerprint = KObservableField(FingerprintHelper.useFingerprint())
    val selectedItemPosition = KObservableField(0)

    private val items = DiffObservableList(ComparableRvItem.callback)
@@ -68,8 +66,16 @@ class SuRequestViewModel(
    }

    fun grantPressed() {
-        handleAction(MagiskPolicy.ALLOW)
-        timer.cancel()
+        cancelTimer()
+        if (BiometricHelper.isEnabled) {
+            withView {
+                BiometricHelper.authenticate(this) {
+                    handleAction(MagiskPolicy.ALLOW)
+                }
+            }
+        } else {
+            handleAction(MagiskPolicy.ALLOW)
+        }
    }

    fun denyPressed() {
@@ -137,13 +143,6 @@ class SuRequestViewModel(
        }
        timer.start()
        cancelTasks.add { cancelTimer() }
-
-        if (canUseFingerprint.value)
-            runCatching {
-                val helper = SuFingerprint()
-                helper.authenticate()
-                cancelTasks.add { helper.cancel() }
-            }
    }

    private fun handleAction() {
@@ -182,24 +181,4 @@ class SuRequestViewModel(
        }
    }

-    private inner class SuFingerprint @Throws(Exception::class)
-    internal constructor() : FingerprintHelper() {
-
-        override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-            warningText.value = errString
-        }
-
-        override fun onAuthenticationHelp(helpCode: Int, helpString: CharSequence) {
-            warningText.value = helpString
-        }
-
-        override fun onAuthenticationSucceeded(result: FingerprintManager.AuthenticationResult) {
-            handleAction(MagiskPolicy.ALLOW)
-        }
-
-        override fun onAuthenticationFailed() {
-            warningText.value = resources.getString(R.string.auth_fail)
-        }
-    }
-
 }
--- a/app/src/main/java/com/topjohnwu/magisk/utils/BiometricHelper.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/BiometricHelper.kt
@@ -0,0 +1,60 @@
+package com.topjohnwu.magisk.utils
+
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+import androidx.fragment.app.FragmentActivity
+import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.R
+import com.topjohnwu.superuser.internal.UiThreadHandler
+import org.koin.core.KoinComponent
+import org.koin.core.get
+
+object BiometricHelper: KoinComponent {
+
+    private val mgr by lazy { BiometricManager.from(get()) }
+
+    val isSupported get() = when (mgr.canAuthenticate()) {
+        BiometricManager.BIOMETRIC_SUCCESS -> true
+        else -> false
+    }
+
+    val isEnabled: Boolean get() {
+        val enabled = Config.suBiometric
+        if (enabled && !isSupported) {
+            Config.suBiometric = false
+            return false
+        }
+        return enabled
+    }
+
+    fun authenticate(
+        activity: FragmentActivity,
+        onError: () -> Unit = {},
+        onSuccess: () -> Unit): BiometricPrompt {
+        val prompt = BiometricPrompt(activity,
+            { cmd: Runnable -> UiThreadHandler.run(cmd) },
+            object : BiometricPrompt.AuthenticationCallback() {
+                override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+                    onError()
+                }
+
+                override fun onAuthenticationFailed() {
+                    onError()
+                }
+
+                override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+                    onSuccess()
+                }
+            }
+        )
+        val info = BiometricPrompt.PromptInfo.Builder()
+            .setConfirmationRequired(true)
+            .setDeviceCredentialAllowed(false)
+            .setTitle(activity.getString(R.string.authenticate))
+            .setNegativeButtonText(activity.getString(android.R.string.cancel))
+            .build()
+        prompt.authenticate(info)
+        return prompt
+    }
+
+}
--- a/app/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.kt
@@ -1,121 +0,0 @@
-package com.topjohnwu.magisk.utils
-
-import android.annotation.TargetApi
-import android.app.KeyguardManager
-import android.content.Context
-import android.hardware.fingerprint.FingerprintManager
-import android.os.Build
-import android.os.CancellationSignal
-import android.security.keystore.KeyGenParameterSpec
-import android.security.keystore.KeyProperties
-import com.topjohnwu.magisk.Config
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.inject
-import java.security.KeyStore
-import javax.crypto.Cipher
-import javax.crypto.KeyGenerator
-import javax.crypto.SecretKey
-
-@TargetApi(Build.VERSION_CODES.M)
-abstract class FingerprintHelper @Throws(Exception::class)
-protected constructor() {
-
-    private val manager: FingerprintManager?
-    private val cipher: Cipher
-    private var cancel: CancellationSignal? = null
-    private val context: Context by inject()
-
-    init {
-        val keyStore = KeyStore.getInstance("AndroidKeyStore")
-        manager = context.getSystemService(FingerprintManager::class.java)
-        cipher = Cipher.getInstance(KeyProperties.KEY_ALGORITHM_AES + "/"
-                + KeyProperties.BLOCK_MODE_CBC + "/"
-                + KeyProperties.ENCRYPTION_PADDING_PKCS7)
-        keyStore.load(null)
-        var key = keyStore.getKey(SU_KEYSTORE_KEY, null) as SecretKey? ?: generateKey()
-        runCatching {
-            cipher.init(Cipher.ENCRYPT_MODE, key)
-        }.onFailure {
-            // Only happens on Marshmallow
-            key = generateKey()
-            cipher.init(Cipher.ENCRYPT_MODE, key)
-        }
-    }
-
-    abstract fun onAuthenticationError(errorCode: Int, errString: CharSequence)
-
-    abstract fun onAuthenticationHelp(helpCode: Int, helpString: CharSequence)
-
-    abstract fun onAuthenticationSucceeded(result: FingerprintManager.AuthenticationResult)
-
-    abstract fun onAuthenticationFailed()
-
-    fun authenticate() {
-        cancel = CancellationSignal()
-        val cryptoObject = FingerprintManager.CryptoObject(cipher)
-        manager!!.authenticate(cryptoObject, cancel, 0, Callback(), null)
-    }
-
-    fun cancel() {
-        if (cancel != null)
-            cancel!!.cancel()
-    }
-
-    @Throws(Exception::class)
-    private fun generateKey(): SecretKey {
-        val keygen = KeyGenerator
-                .getInstance(KeyProperties.KEY_ALGORITHM_AES, "AndroidKeyStore")
-        val builder = KeyGenParameterSpec.Builder(
-                SU_KEYSTORE_KEY,
-                KeyProperties.PURPOSE_ENCRYPT or 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 inner class Callback : FingerprintManager.AuthenticationCallback() {
-        override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-            this@FingerprintHelper.onAuthenticationError(errorCode, errString)
-        }
-
-        override fun onAuthenticationHelp(helpCode: Int, helpString: CharSequence) {
-            this@FingerprintHelper.onAuthenticationHelp(helpCode, helpString)
-        }
-
-        override fun onAuthenticationSucceeded(result: FingerprintManager.AuthenticationResult) {
-            this@FingerprintHelper.onAuthenticationSucceeded(result)
-        }
-
-        override fun onAuthenticationFailed() {
-            this@FingerprintHelper.onAuthenticationFailed()
-        }
-    }
-
-    companion object {
-        private const val SU_KEYSTORE_KEY = "su_key"
-
-        fun useFingerprint(): Boolean {
-            var fp = Config.suFingerprint
-            if (fp && !canUseFingerprint()) {
-                Config.suFingerprint = false
-                fp = false
-            }
-            return fp
-        }
-
-        fun canUseFingerprint(context: Context = get()): Boolean {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
-                return false
-            val km = context.getSystemService(KeyguardManager::class.java)
-            val fm = context.getSystemService(FingerprintManager::class.java)
-            return km?.isKeyguardSecure ?: false &&
-                    fm != null && fm.isHardwareDetected && fm.hasEnrolledFingerprints()
-        }
-    }
-}
--- a/app/src/main/java/com/topjohnwu/magisk/view/dialogs/FingerprintAuthDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/view/dialogs/FingerprintAuthDialog.kt
@@ -1,88 +0,0 @@
-package com.topjohnwu.magisk.view.dialogs
-
-import android.annotation.TargetApi
-import android.app.Activity
-import android.graphics.Color
-import android.hardware.fingerprint.FingerprintManager
-import android.os.Build
-import android.view.Gravity
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.utils.FingerprintHelper
-import com.topjohnwu.magisk.utils.Utils
-
-@TargetApi(Build.VERSION_CODES.M)
-class FingerprintAuthDialog(activity: Activity, private val callback: () -> Unit)
-    : CustomAlertDialog(activity) {
-
-    private var failureCallback: (() -> Unit)? = null
-    private var helper: DialogFingerprintHelper? = null
-
-    init {
-        val fingerprint = ContextCompat.getDrawable(activity, R.drawable.ic_fingerprint)
-        fingerprint?.setBounds(0, 0, Utils.dpInPx(50), Utils.dpInPx(50))
-        val theme = activity.theme
-        val ta = theme.obtainStyledAttributes(intArrayOf(R.attr.imageColorTint))
-        fingerprint?.setTint(ta.getColor(0, Color.GRAY))
-        ta.recycle()
-        binding.message.setCompoundDrawables(null, null, null, fingerprint)
-        binding.message.compoundDrawablePadding = Utils.dpInPx(20)
-        binding.message.gravity = Gravity.CENTER
-        setMessage(R.string.auth_fingerprint)
-        setNegativeButton(android.R.string.cancel) { _, _ ->
-            helper?.cancel()
-            failureCallback?.invoke()
-        }
-        setOnCancelListener {
-            helper?.cancel()
-            failureCallback?.invoke()
-        }
-        runCatching {
-            helper = DialogFingerprintHelper()
-        }
-
-    }
-
-    constructor(activity: Activity, onSuccess: () -> Unit, onFailure: () -> Unit)
-            : this(activity, onSuccess) {
-        failureCallback = onFailure
-    }
-
-    override fun show(): AlertDialog {
-        return create().apply {
-            if (helper == null) {
-                dismiss()
-                Utils.toast(R.string.auth_fail, Toast.LENGTH_SHORT)
-            } else {
-                helper?.authenticate()
-                show()
-            }
-        }
-    }
-
-    internal inner class DialogFingerprintHelper @Throws(Exception::class)
-    constructor() : FingerprintHelper() {
-
-        override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-            binding.message.setTextColor(Color.RED)
-            binding.message.text = errString
-        }
-
-        override fun onAuthenticationHelp(helpCode: Int, helpString: CharSequence) {
-            binding.message.setTextColor(Color.RED)
-            binding.message.text = helpString
-        }
-
-        override fun onAuthenticationFailed() {
-            binding.message.setTextColor(Color.RED)
-            binding.message.setText(R.string.auth_fail)
-        }
-
-        override fun onAuthenticationSucceeded(result: FingerprintManager.AuthenticationResult) {
-            dismiss()
-            callback()
-        }
-    }
-}