br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Random small refactoring

Browse Source
This commit is contained in:
topjohnwu
2023-07-24 23:49:20 -07:00
parent 6141bb5bb3
commit cf1bc82537
10 changed files with 21 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
+2 -1
View File
@@ -12,6 +12,7 @@ import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.core.Config
import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.core.Info
import com.topjohnwu.magisk.core.di.ServiceLocator
import com.topjohnwu.magisk.core.ktx.activity
import com.topjohnwu.magisk.core.tasks.HideAPK
import com.topjohnwu.magisk.core.utils.BiometricHelper
@@ -289,7 +290,7 @@ object Biometrics : BaseSettingsItem.Toggle() {
override var value by Config::suBiometric
override fun refresh() {
isEnabled = BiometricHelper.isSupported
isEnabled = ServiceLocator.biometrics.isSupported
if (!isEnabled) {
value = false
description = R.string.no_biometric.asText()
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
+3 -2
View File
@@ -13,6 +13,7 @@ import com.topjohnwu.magisk.arch.AsyncLoadViewModel
import com.topjohnwu.magisk.core.Info
import com.topjohnwu.magisk.core.data.magiskdb.PolicyDao
import com.topjohnwu.magisk.core.di.AppContext
import com.topjohnwu.magisk.core.di.ServiceLocator
import com.topjohnwu.magisk.core.ktx.getLabel
import com.topjohnwu.magisk.core.model.su.SuPolicy
import com.topjohnwu.magisk.core.utils.BiometricHelper
@@ -113,7 +114,7 @@ class SuperuserViewModel(
}
}
if (BiometricHelper.isEnabled) {
if (ServiceLocator.biometrics.isEnabled) {
BiometricEvent {
onSuccess { updateState() }
}.publish()
@@ -169,7 +170,7 @@ class SuperuserViewModel(
}
}
if (BiometricHelper.isEnabled) {
if (ServiceLocator.biometrics.isEnabled) {
BiometricEvent {
onSuccess { updateState() }
}.publish()
app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
+2 -1
View File
@@ -22,6 +22,7 @@ import com.topjohnwu.magisk.arch.BaseViewModel
import com.topjohnwu.magisk.core.Config
import com.topjohnwu.magisk.core.data.magiskdb.PolicyDao
import com.topjohnwu.magisk.core.di.AppContext
import com.topjohnwu.magisk.core.di.ServiceLocator
import com.topjohnwu.magisk.core.ktx.getLabel
import com.topjohnwu.magisk.core.ktx.toast
import com.topjohnwu.magisk.core.model.su.SuPolicy.Companion.ALLOW
@@ -75,7 +76,7 @@ class SuRequestViewModel(
fun grantPressed() {
cancelTimer()
if (BiometricHelper.isEnabled) {
if (ServiceLocator.biometrics.isEnabled) {
BiometricEvent {
onSuccess {
respond(ALLOW)