From 108149b6b7655e86e534061397e245abbe5ed50d Mon Sep 17 00:00:00 2001 From: Qing_Feng <146433624+Qing0731@users.noreply.github.com> Date: Mon, 21 Jul 2025 13:37:52 +0800 Subject: [PATCH] Remove WebUI integration (#345) Having a WebUI simply duplicating the current function of the Action button is unnecessary. Since most users are migrated to root implementations which realize the Action button feature, we revert commit f8409ad34bead2c2ea56aa8bcebd337b616afbe6 to remove the WebUI integration of LSPosed. --- .github/workflows/core.yml | 5 --- magisk-loader/build.gradle.kts | 52 +----------------------- magisk-loader/magisk_module/customize.sh | 10 ----- magisk-loader/src/webroot/index.html | 9 ---- magisk-loader/src/webroot/index.js | 12 ------ 5 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 magisk-loader/src/webroot/index.html delete mode 100644 magisk-loader/src/webroot/index.js diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index f9a33600..0077b031 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -67,11 +67,6 @@ jobs: with: version: 1.12.1 - - name: Setup pnpm - uses: pnpm/action-setup@v4 - with: - version: latest - - name: Setup ccache uses: actions/cache@v4 with: diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts index 4a7468a1..6a50f6c4 100644 --- a/magisk-loader/build.gradle.kts +++ b/magisk-loader/build.gradle.kts @@ -112,46 +112,6 @@ val zipAll = task("zipAll") { group = "LSPosed" } -val generateWebRoot = tasks.register("generateWebRoot") { - group = "LSPosed" - val webroottmp = File("$projectDir/build/intermediates/generateWebRoot") - val webrootsrc = File(webroottmp, "src") - - onlyIf { - val os = org.gradle.internal.os.OperatingSystem.current() - if (os.isWindows) { - exec { - commandLine("cmd", "/c", "where", "pnpm") - isIgnoreExitValue = true - }.exitValue == 0 - } else { - exec { - commandLine("which", "pnpm") - isIgnoreExitValue = true - }.exitValue == 0 - } - } - - doFirst { - webroottmp.mkdirs() - webrootsrc.mkdirs() - } - - from("$projectDir/src/webroot") - into(webrootsrc) - - doLast { - exec { - workingDir = webroottmp - commandLine("pnpm", "add", "-D", "parcel", "kernelsu") - } - exec { - workingDir = webroottmp - commandLine("./node_modules/.bin/parcel", "build", "src/index.html") - } - } -} - fun afterEval() = android.applicationVariants.forEach { variant -> val variantCapped = variant.name.replaceFirstChar { it.uppercase() } val variantLowered = variant.name.lowercase() @@ -171,8 +131,7 @@ fun afterEval() = android.applicationVariants.forEach { variant -> "assemble$variantCapped", ":app:package$buildTypeCapped", ":daemon:package$buildTypeCapped", - ":dex2oat:externalNativeBuild${buildTypeCapped}", - generateWebRoot + ":dex2oat:externalNativeBuild${buildTypeCapped}" ) into(magiskDir) from("${rootProject.projectDir}/README.md") @@ -232,15 +191,6 @@ fun afterEval() = android.applicationVariants.forEach { variant -> from(dexOutPath) rename("classes.dex", "lspd.dex") } - into("webroot") { - if (flavorLowered.startsWith("zygisk")) { - from("$projectDir/build/intermediates/generateWebRoot/dist") { - include("**/*.js") - include("**/*.html") - } - } - } - val injected = objects.newInstance(magiskDir.get().asFile.path) doLast { injected.factory.fileTree().from(injected.magiskDir).visit { diff --git a/magisk-loader/magisk_module/customize.sh b/magisk-loader/magisk_module/customize.sh index b0d1947c..010a9432 100644 --- a/magisk-loader/magisk_module/customize.sh +++ b/magisk-loader/magisk_module/customize.sh @@ -84,16 +84,6 @@ rm -f /data/adb/lspd/manager.apk extract "$ZIPFILE" 'manager.apk' "$MODPATH" if [ "$FLAVOR" == "zygisk" ]; then - # extract for KernelSU and APatch - if [ "$KSU" ] || [ "$APATCH" ]; then - # webroot only for zygisk - mkdir -p "$MODPATH/webroot" - extract "$ZIPFILE" "webroot/index.html" "$MODPATH/webroot" true - # evaluate if use awk or tr -s ' ' | cut -d' ' -f5 - SRCJS=$(unzip -l "$ZIPFILE" | grep "webroot/generate" | grep -v sha256 | awk '{print $4}') - extract "$ZIPFILE" "$SRCJS" "$MODPATH/webroot" true - fi - mkdir -p "$MODPATH/zygisk" if [ "$ARCH" = "arm" ] || [ "$ARCH" = "arm64" ]; then diff --git a/magisk-loader/src/webroot/index.html b/magisk-loader/src/webroot/index.html deleted file mode 100644 index 639356da..00000000 --- a/magisk-loader/src/webroot/index.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - JingMatrix/LSPosed - - - - diff --git a/magisk-loader/src/webroot/index.js b/magisk-loader/src/webroot/index.js deleted file mode 100644 index 737fea8a..00000000 --- a/magisk-loader/src/webroot/index.js +++ /dev/null @@ -1,12 +0,0 @@ -import { exec } from "kernelsu"; -import { toast } from "kernelsu"; - -async function open_manager() { - toast("LSPosed Manager starting..."); - const { errno, stdout, stderr } = await exec( - "am start -c org.lsposed.manager.LAUNCH_MANAGER com.android.shell/.BugreportWarningActivity", - { cwd: "/system" } - ); -} - -open_manager();