Don't require reload config if config version is the same

Dr-TSNG · Dec 30, 2022 · abb67b9 · abb67b9
1 parent 99c3e1f
commit abb67b9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/MyApp.kt b/app/src/main/java/icu/nullptr/hidemyapplist/MyApp.kt
@@ -3,6 +3,7 @@ package icu.nullptr.hidemyapplist
 import android.annotation.SuppressLint
 import android.app.Application
 import com.tsng.hidemyapplist.R
+import icu.nullptr.hidemyapplist.service.ConfigManager
 import icu.nullptr.hidemyapplist.service.PrefManager
 import icu.nullptr.hidemyapplist.ui.receiver.AppChangeReceiver
 import icu.nullptr.hidemyapplist.ui.util.makeToast
@@ -37,6 +38,7 @@ class MyApp : Application() {
         }
         hmaApp = this
         AppChangeReceiver.register(this)
+        ConfigManager.init()
 
         DayNightDelegate.setApplicationContext(this)
         DayNightDelegate.setDefaultNightMode(PrefManager.darkTheme)

diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/service/ConfigManager.kt b/app/src/main/java/icu/nullptr/hidemyapplist/service/ConfigManager.kt
@@ -17,14 +17,15 @@ object ConfigManager {
     private lateinit var config: JsonConfig
     val configFile = File("${hmaApp.filesDir.absolutePath}/config.json")
 
-    init {
-        if (!configFile.exists())
+    fun init() {
+        if (!configFile.exists()) {
             configFile.writeText(JsonConfig().toString())
+        }
         runCatching {
             config = JsonConfig.parse(configFile.readText())
             val configVersion = config.configVersion
             if (configVersion < 65) throw RuntimeException("Config version too old")
-            config.configVersion = BuildConfig.SERVICE_VERSION
+            config.configVersion = BuildConfig.CONFIG_VERSION
             saveConfig()
         }.onFailure {
             makeToast(R.string.config_damaged)
@@ -63,7 +64,7 @@ object ConfigManager {
 
     fun importConfig(json: String) {
         config = JsonConfig.parse(json)
-        config.configVersion = BuildConfig.SERVICE_VERSION
+        config.configVersion = BuildConfig.CONFIG_VERSION
         saveConfig()
     }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -36,7 +36,8 @@ val targetSdkVer by extra(33)
 val buildToolsVer by extra("33.0.1")
 
 val appVerName by extra("3.0.6")
-val serviceVerCode by extra(93)
+val configVerCode by extra(90)
+val serviceVerCode by extra(94)
 val minBackupVerCode by extra(65)
 
 val androidSourceCompatibility = JavaVersion.VERSION_11

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -5,13 +5,15 @@ plugins {
     kotlin("plugin.serialization")
 }
 
+val configVerCode: Int by rootProject.extra
 val serviceVerCode: Int by rootProject.extra
 val minBackupVerCode: Int by rootProject.extra
 
 android {
     namespace = "icu.nullptr.hidemyapplist.common"
 
     defaultConfig {
+        buildConfigField("int", "CONFIG_VERSION", configVerCode.toString())
         buildConfigField("int", "SERVICE_VERSION", serviceVerCode.toString())
         buildConfigField("int", "MIN_BACKUP_VERSION", minBackupVerCode.toString())
     }

diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/JsonConfig.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/JsonConfig.kt
@@ -12,7 +12,7 @@ private val encoder = Json {
 
 @Serializable
 data class JsonConfig(
-    var configVersion: Int = BuildConfig.SERVICE_VERSION,
+    var configVersion: Int = BuildConfig.CONFIG_VERSION,
     var detailLog: Boolean = false,
     var maxLogSize: Int = 512,
     var forceMountData: Boolean = true,

diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt
@@ -27,7 +27,7 @@ class HMAService(val pms: IPackageManager) : IHMAService.Stub() {
     private val systemApps = mutableSetOf<String>()
     private val frameworkHooks = mutableSetOf<IFrameworkHook>()
 
-    var config = JsonConfig()
+    var config = JsonConfig().apply { detailLog = true }
         private set
 
     var filterCount = 0
@@ -92,7 +92,7 @@ class HMAService(val pms: IPackageManager) : IHMAService.Stub() {
             logE(TAG, "Failed to parse config.json", it)
             return
         }
-        if (loading.configVersion != BuildConfig.SERVICE_VERSION) {
+        if (loading.configVersion != BuildConfig.CONFIG_VERSION) {
             logW(TAG, "Config version mismatch, need to reload")
             return
         }
@@ -171,7 +171,7 @@ class HMAService(val pms: IPackageManager) : IHMAService.Stub() {
         synchronized(configLock) {
             configFile.writeText(json)
             val newConfig = JsonConfig.parse(json)
-            if (newConfig.configVersion != BuildConfig.SERVICE_VERSION) {
+            if (newConfig.configVersion != BuildConfig.CONFIG_VERSION) {
                 logW(TAG, "Sync config: version mismatch, need reboot")
                 return
             }
@@ -185,7 +185,9 @@ class HMAService(val pms: IPackageManager) : IHMAService.Stub() {
 
     override fun getFilterCount() = filterCount
 
-    override fun getLogs() = synchronized(loggerLock) { logFile.readText() }
+    override fun getLogs() = synchronized(loggerLock) {
+        logFile.readText()
+    }
 
     override fun clearLogs() {
         synchronized(loggerLock) {