From b58891d5c62606557f9feda0f31d268276fcb58d Mon Sep 17 00:00:00 2001 From: Keeperorowner <1832713361@qq.com> Date: Sat, 19 Apr 2025 16:36:53 +0800 Subject: [PATCH 1/2] Update action implementation and remove webroot --- magisk-loader/magisk_module/action.sh | 10 ++++++---- magisk-loader/magisk_module/customize.sh | 10 ---------- magisk-loader/src/webroot/index.html | 9 --------- magisk-loader/src/webroot/index.js | 12 ------------ 4 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 magisk-loader/src/webroot/index.html delete mode 100644 magisk-loader/src/webroot/index.js diff --git a/magisk-loader/magisk_module/action.sh b/magisk-loader/magisk_module/action.sh index 42359ce19..bc51c3ff5 100644 --- a/magisk-loader/magisk_module/action.sh +++ b/magisk-loader/magisk_module/action.sh @@ -1,4 +1,6 @@ -DEFAULT_MANAGER_PACKAGE_NAME=org.lsposed.manager -INJECTED_PACKAGE_NAME=com.android.shell - -am start -c "${DEFAULT_MANAGER_PACKAGE_NAME}.LAUNCH_MANAGER" "${INJECTED_PACKAGE_NAME}/.BugreportWarningActivity" +API=$(getprop ro.build.version.sdk) +if [ "$API" -ge 29 ]; then + am broadcast -a android.telephony.action.SECRET_CODE -d android_secret_code://5776733 android +else + am broadcast -a android.provider.Telephony.SECRET_CODE -d android_secret_code://5776733 android +fi \ No newline at end of file diff --git a/magisk-loader/magisk_module/customize.sh b/magisk-loader/magisk_module/customize.sh index f1a12db22..010a94324 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/src" | 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 7ceefe5a3..000000000 --- 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 737fea8a5..000000000 --- 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(); From 9872845f0cf5f12658f25dbed900c839d97e0cc2 Mon Sep 17 00:00:00 2001 From: Keeperorowner <1832713361@qq.com> Date: Sat, 19 Apr 2025 16:41:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20core.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix Github action --- .github/workflows/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index f9a33600c..7400af9a3 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -8,7 +8,7 @@ on: required: true type: boolean push: - branches: [ master ] + branches: [ main ] tags: [ v* ] pull_request: merge_group: