fix package cache

sibalma · May 15, 2023 · 00b6254 · 00b6254
1 parent 11ecdba
commit 00b6254
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/AboutFragment.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/AboutFragment.kt
@@ -113,6 +113,7 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {
                         .setOnClickAction { }
                         .build())
                     .apply {
+                        PackageCache.awaitLoadSync()
                         for ((_, pkg) in PackageCache.installedPluginPackages) {
                             try {
                                 val pluginId = pkg.providers[0].loadString(Plugins.METADATA_KEY_ID)

diff --git a/app/src/main/java/io/nekohasekai/sagernet/utils/PackageCache.kt b/app/src/main/java/io/nekohasekai/sagernet/utils/PackageCache.kt
@@ -30,6 +30,7 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import moe.matsuri.nya.neko.Plugins
+import java.util.concurrent.atomic.AtomicBoolean
 
 object PackageCache {
 
@@ -39,9 +40,11 @@ object PackageCache {
     lateinit var packageMap: Map<String, Int>
     val uidMap = HashMap<Int, HashSet<String>>()
     val loaded = Mutex(true)
+    var registerd = AtomicBoolean(false)
 
     // called from init (suspend)
     fun register() {
+        if (registerd.getAndSet(true)) return
         reload()
         app.listenForPackageChanges(false) {
             reload()
@@ -96,6 +99,10 @@ object PackageCache {
         if (::packageMap.isInitialized) {
             return
         }
+        if (!registerd.get()) {
+            register()
+            return
+        }
         runBlocking {
             loaded.withLock {
                 // just await