update config

Author: DerGoogler

webui/src/main/kotlin/com/dergoogler/mmrl/webui/model/Config.kt

@@ -34,16 +34,24 @@ data class WebUIConfigRequireVersion(
     val required: Int = 1,
     val supportText: String? = null,
     val supportLink: String? = null,
-    val packages: List<WebUIConfigRequireVersionPackages> = emptyList()
 )
 
 @JsonClass(generateAdapter = true)
 data class WebUIConfigRequireVersionPackages(
     val code: Int = -1,
-    val packageName: String,
+    val packageName: Any,
     val supportText: String? = null,
     val supportLink: String? = null,
-)
+) {
+    val packageNames
+        get(): List<String> {
+            return when (packageName) {
+                is String -> listOf(packageName)
+                is List<*> -> packageName.filterIsInstance<String>()
+                else -> emptyList()
+            }
+        }
+}
 
 /**
  * Represents the required configuration for the Web UI.
@@ -55,6 +63,7 @@ data class WebUIConfigRequireVersionPackages(
  */
 @JsonClass(generateAdapter = true)
 data class WebUIConfigRequire(
+    val packages: List<WebUIConfigRequireVersionPackages> = emptyList(),
     val version: WebUIConfigRequireVersion = WebUIConfigRequireVersion(),
 )
 

webui/src/main/kotlin/com/dergoogler/mmrl/webui/util/rememberWebUIOptions.kt

@@ -106,41 +106,45 @@ data class WebUIOptions(
     private val currentPackageInfo: PackageInfo?
         get() {
             if (packageManager == null) {
+                Log.d(TAG, "packageManager is null")
                 return null
             }
 
             if (myUserId == null) {
+                Log.d(TAG, "myUserId is null")
                 return null
             }
 
             try {
                 return packageManager!!.getPackageInfo(context.packageName, 0, myUserId!!)
             } catch (e: Exception) {
-                Log.e("WebUIOptions", "Error getting package version code: ${e.message}")
+                Log.e(TAG, "Error getting package version code: ${e.message}")
                 return null
             }
         }
 
     val requireNewAppVersion: Boolean
         get() {
             if (currentPackageInfo == null) {
+                Log.d(TAG, "currentPackageInfo is null")
                 return false
             }
 
             val packageName = currentPackageInfo!!.packageName
             val versionCode = PackageInfoCompat.getLongVersionCode(currentPackageInfo!!)
 
-            val findPkgFromCfg =
-                config.require.version.packages.find { it.packageName == packageName }
+            val findPkgFromCfg = config.require.packages.find { pkg ->
+                packageName in pkg.packageNames
+            }
 
             if (findPkgFromCfg == null) {
+                Log.d(TAG, "Package $packageName not found in config")
                 return false
             }
 
             return versionCode < findPkgFromCfg.code
         }
 
-
     val domainUrl
         get(): String {
             if (debug && remoteDebug) {
@@ -166,6 +170,9 @@ data class WebUIOptions(
         }
     }
 
+    private companion object Default {
+        const val TAG = "WebUIOptions"
+    }
 }
 
 /**