Rename some biometrics things since it's no longer specifically for biometric auth
This commit is contained in:
@@ -5,7 +5,7 @@ import android.view.WindowManager
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
|
||||
import eu.kanade.tachiyomi.util.system.BiometricUtil
|
||||
import eu.kanade.tachiyomi.util.system.AuthenticatorUtil
|
||||
import kotlinx.coroutines.flow.launchIn
|
||||
import kotlinx.coroutines.flow.onEach
|
||||
import uy.kohesive.injekt.injectLazy
|
||||
@@ -28,14 +28,14 @@ class SecureActivityDelegate(private val activity: FragmentActivity) {
|
||||
}
|
||||
|
||||
fun onResume() {
|
||||
if (preferences.useBiometricLock().get()) {
|
||||
if (BiometricUtil.isSupported(activity)) {
|
||||
if (preferences.useAuthenticator().get()) {
|
||||
if (AuthenticatorUtil.isSupported(activity)) {
|
||||
if (isAppLocked()) {
|
||||
activity.startActivity(Intent(activity, BiometricUnlockActivity::class.java))
|
||||
activity.startActivity(Intent(activity, UnlockActivity::class.java))
|
||||
activity.overridePendingTransition(0, 0)
|
||||
}
|
||||
} else {
|
||||
preferences.useBiometricLock().set(false)
|
||||
preferences.useAuthenticator().set(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -4,7 +4,7 @@ import android.os.Bundle
|
||||
import androidx.biometric.BiometricPrompt
|
||||
import eu.kanade.tachiyomi.R
|
||||
import eu.kanade.tachiyomi.ui.base.activity.BaseThemedActivity
|
||||
import eu.kanade.tachiyomi.util.system.BiometricUtil
|
||||
import eu.kanade.tachiyomi.util.system.AuthenticatorUtil
|
||||
import timber.log.Timber
|
||||
import java.util.Date
|
||||
import java.util.concurrent.Executors
|
||||
@@ -12,7 +12,7 @@ import java.util.concurrent.Executors
|
||||
/**
|
||||
* Blank activity with a BiometricPrompt.
|
||||
*/
|
||||
class BiometricUnlockActivity : BaseThemedActivity() {
|
||||
class UnlockActivity : BaseThemedActivity() {
|
||||
|
||||
private val executor = Executors.newSingleThreadExecutor()
|
||||
|
||||
@@ -40,10 +40,10 @@ class BiometricUnlockActivity : BaseThemedActivity() {
|
||||
|
||||
var promptInfo = BiometricPrompt.PromptInfo.Builder()
|
||||
.setTitle(getString(R.string.unlock_app))
|
||||
.setAllowedAuthenticators(BiometricUtil.getSupportedAuthenticators(this))
|
||||
.setAllowedAuthenticators(AuthenticatorUtil.getSupportedAuthenticators(this))
|
||||
.setConfirmationRequired(false)
|
||||
|
||||
if (!BiometricUtil.isDeviceCredentialAllowed(this)) {
|
||||
if (!AuthenticatorUtil.isDeviceCredentialAllowed(this)) {
|
||||
promptInfo = promptInfo.setNegativeButtonText(getString(R.string.action_cancel))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user