Move manager APK to module path (#2787)

daemon/src/main/java/org/lsposed/lspd/service/ConfigFileManager.java

@@ -81,7 +81,7 @@ public class ConfigFileManager {
     static final Path basePath = Paths.get("/data/adb/lspd");
     static final Path modulePath = basePath.resolve("modules");
     static final Path daemonApkPath = Paths.get(System.getProperty("java.class.path", null));
-    static final Path managerApkPath = basePath.resolve("manager.apk");
+    static final Path managerApkPath = daemonApkPath.getParent().resolve("manager.apk");
     static final File magiskDbPath = new File("/data/adb/magisk.db");
     private static final Path lockPath = basePath.resolve("lock");
     private static final Path configDirPath = basePath.resolve("config");

magisk-loader/build.gradle.kts

@@ -317,7 +317,7 @@ val reRunDaemon = task<Exec>("reRunDaemon") {
     )
     isIgnoreExitValue = true
 }
-val tmpApk = "/data/local/tmp/lsp.apk"
+val tmpApk = "/data/local/tmp/manager.apk"
 val pushApk = task<Exec>("pushApk") {
     group = "LSPosed"
     dependsOn(":app:assembleDebug")
@@ -332,11 +332,9 @@ val openApp = task<Exec>("openApp") {
         "com.android.shell/.BugreportWarningActivity"
     )
 }
-task<Exec>("reRunApp") {
+task("reRunApp") {
     group = "LSPosed"
     dependsOn(pushApk)
-    commandLine(adb, "shell", "su", "-c", "mv -f $tmpApk /data/adb/lspd/manager.apk")
-    isIgnoreExitValue = true
     finalizedBy(reRunDaemon)
 }
 

magisk-loader/magisk_module/customize.sh

@@ -87,7 +87,7 @@ extract "$ZIPFILE" 'framework/lspd.dex' "$MODPATH"
 extract "$ZIPFILE" 'daemon.apk'         "$MODPATH"
 extract "$ZIPFILE" 'daemon'             "$MODPATH"
 rm -f /data/adb/lspd/manager.apk
-extract "$ZIPFILE" 'manager.apk'        '/data/adb/lspd'
+extract "$ZIPFILE" 'manager.apk'        "$MODPATH"
 
 if [ "$FLAVOR" == "zygisk" ]; then
   mkdir -p "$MODPATH/zygisk"

magisk-loader/magisk_module/post-fs-data.sh

@@ -20,6 +20,7 @@
 MODDIR=${0%/*}
 
 rm -f "/data/local/tmp/daemon.apk"
+rm -f "/data/local/tmp/manager.apk"
 cd "$MODDIR"
 
 unshare -m sh -c "$MODDIR/daemon $@&"