From ec0dac16836e7c75969db62a5ce47652aafb409b Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sat, 18 Sep 2021 11:19:36 +0800
Subject: [PATCH] [core] Fix system module path update (#1126)

---
 .../org/lsposed/lspd/service/ConfigManager.java  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java
index 006d9e1c..8a3a2477 100644
--- a/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java
+++ b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java
@@ -416,7 +416,7 @@ public class ConfigManager {
             }
             if (PackageService.isAlive()) {
                 obsoleteModules.forEach(this::removeModuleWithoutCache);
-                obsoletePaths.forEach(this::updateModuleApkPath);
+                obsoletePaths.forEach((packageName, path) -> updateModuleApkPath(packageName, path, true));
             } else {
                 Log.w(TAG, "pm is dead while caching. invalidating...");
                 clearCache();
@@ -424,8 +424,8 @@ public class ConfigManager {
             }
         }
         Log.d(TAG, "cached modules");
-        for (String module : cachedModule.keySet()) {
-            Log.d(TAG, module);
+        for (var module : cachedModule.entrySet()) {
+            Log.d(TAG, module.getKey() + " " + module.getValue().apkPath);
         }
         cacheScopes();
     }
@@ -577,7 +577,7 @@ public class ConfigManager {
         return apkPath.orElse(null);
     }
 
-    public boolean updateModuleApkPath(String packageName, String apkPath) {
+    public boolean updateModuleApkPath(String packageName, String apkPath, boolean force) {
         if (apkPath == null) return false;
         if (db.inTransaction()) {
             Log.w(TAG, "update module apk path should not be called inside transaction");
@@ -591,7 +591,7 @@ public class ConfigManager {
         int count = (int) db.insertWithOnConflict("modules", null, values, SQLiteDatabase.CONFLICT_IGNORE);
         if (count < 0) {
             var cached = cachedModule.getOrDefault(packageName, null);
-            if (cached == null || cached.apkPath == null || !cached.apkPath.equals(apkPath))
+            if (force || cached == null || cached.apkPath == null || !cached.apkPath.equals(apkPath))
                 count = db.updateWithOnConflict("modules", values, "module_pkg_name=?", new String[]{packageName}, SQLiteDatabase.CONFLICT_IGNORE);
             else
                 count = 0;
@@ -731,7 +731,7 @@ public class ConfigManager {
     }
 
     public boolean enableModule(String packageName, ApplicationInfo info) {
-        if (!updateModuleApkPath(packageName, getModuleApkPath(info))) return false;
+        if (!updateModuleApkPath(packageName, getModuleApkPath(info), false)) return false;
         int mid = getModuleId(packageName);
         if (mid == -1) return false;
         try {
@@ -884,10 +884,6 @@ public class ConfigManager {
         ConfigFileManager.deleteFolderIfExists(path);
     }
 
-    public String getManagerPackageName() {
-        return manager;
-    }
-
     public boolean isSepolicyLoaded() {
         return sepolicyLoaded;
     }