Update denylist config implementation

app/src/main/java/com/topjohnwu/magisk/core/Config.kt

@@ -6,9 +6,9 @@ import android.util.Xml
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.core.utils.BiometricHelper
 import com.topjohnwu.magisk.core.utils.refreshLocale
 import com.topjohnwu.magisk.data.preference.PreferenceModel
+import com.topjohnwu.magisk.data.repository.DBBoolSettingsNoWrite
 import com.topjohnwu.magisk.data.repository.DBConfig
 import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.magisk.ui.theme.Theme
@@ -38,6 +38,7 @@ object Config : PreferenceModel, DBConfig {
         const val SU_MNT_NS = "mnt_ns"
         const val SU_BIOMETRIC = "su_biometric"
         const val ZYGISK = "zygisk"
+        const val DENYLIST = "denylist"
         const val SU_MANAGER = "requester"
         const val KEYSTORE = "keystore"
 
@@ -145,6 +146,7 @@ object Config : PreferenceModel, DBConfig {
     var suMultiuserMode by dbSettings(Key.SU_MULTIUSER_MODE, Value.MULTIUSER_MODE_OWNER_ONLY)
     var suBiometric by dbSettings(Key.SU_BIOMETRIC, false)
     var zygisk by dbSettings(Key.ZYGISK, false)
+    var denyList by DBBoolSettingsNoWrite(Key.DENYLIST, false)
     var suManager by dbStrings(Key.SU_MANAGER, "", true)
     var keyStoreRaw by dbStrings(Key.KEYSTORE, "", true)
 
@@ -169,12 +171,6 @@ object Config : PreferenceModel, DBConfig {
                 else if (it.toInt() > Value.CANARY_CHANNEL)
                     putString(Key.UPDATE_CHANNEL, Value.CANARY_CHANNEL.toString())
             }
-
-            // Write database configs
-            putString(Key.ROOT_ACCESS, rootMode.toString())
-            putString(Key.SU_MNT_NS, suMntNamespaceMode.toString())
-            putString(Key.SU_MULTIUSER_MODE, suMultiuserMode.toString())
-            putBoolean(Key.SU_BIOMETRIC, BiometricHelper.isEnabled)
         }
     }
 

app/src/main/java/com/topjohnwu/magisk/core/Info.kt

@@ -64,9 +64,5 @@ object Info {
         }
         val isUnsupported = code > 0 && code < Const.Version.MIN_VERCODE
         val isActive = magiskVersionCode >= 0
-        var denyListEnforced = if (Const.Version.isCanary(code))
-            Shell.su("magisk --denylist status").exec().isSuccess
-        else
-            false
     }
 }

app/src/main/java/com/topjohnwu/magisk/data/repository/DBConfig.kt

@@ -35,14 +35,12 @@ class DBSettingsValue(
     private val default: Int
 ) : ReadWriteProperty<DBConfig, Int> {
 
-    private var value: Int? = null
+    var value: Int? = null
 
     @Synchronized
     override fun getValue(thisRef: DBConfig, property: KProperty<*>): Int {
         if (value == null)
-            value = runBlocking {
-                thisRef.settingsDB.fetch(name, default)
-            }
+            value = runBlocking { thisRef.settingsDB.fetch(name, default) }
         return value as Int
     }
 
@@ -56,7 +54,7 @@ class DBSettingsValue(
     }
 }
 
-class DBBoolSettings(
+open class DBBoolSettings(
     name: String,
     default: Boolean
 ) : ReadWriteProperty<DBConfig, Boolean> {
@@ -70,6 +68,17 @@ class DBBoolSettings(
         base.setValue(thisRef, property, if (value) 1 else 0)
 }
 
+class DBBoolSettingsNoWrite(
+    name: String,
+    default: Boolean
+) : DBBoolSettings(name, default) {
+    override fun setValue(thisRef: DBConfig, property: KProperty<*>, value: Boolean) {
+        synchronized(base) {
+            base.value = if (value) 1 else 0
+        }
+    }
+}
+
 class DBStringsValue(
     private val name: String,
     private val default: String,

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt

@@ -251,11 +251,11 @@ object DenyList : BaseSettingsItem.Toggle() {
         if (isEnabled) R.string.settings_denylist_summary.asText()
         else R.string.settings_denylist_error.asText(R.string.zygisk.asText())
 
-    override var value = Info.env.denyListEnforced
+    override var value = Config.denyList
         set(value) = setV(value, field, { field = it }) {
             val cmd = if (it) "enable" else "disable"
             Shell.su("magisk --denylist $cmd").submit { result ->
-                if (result.isSuccess) Info.env.denyListEnforced = it
+                if (result.isSuccess) Config.denyList = it
                 else field = !it
             }
             DenyListConfig.isEnabled = it