diff --git a/module/common/get_extra.sh b/module/common/get_extra.sh index 55475bc..313171b 100644 --- a/module/common/get_extra.sh +++ b/module/common/get_extra.sh @@ -11,12 +11,12 @@ aapt() { "$MODPATH/aapt" "$@"; } # wget = low pref, no ssl. # curl, has ssl on android, we use it if found download() { - if command -v curl > /dev/null 2>&1; then - curl --connect-timeout 3 -s "$1" - else - busybox wget -T 3 --no-check-certificate -qO - "$1" - fi -} + if command -v curl >/dev/null 2>&1; then + timeout 3 curl -s "$1" + else + timeout 3 busybox wget --no-check-certificate -qO - "$1" + fi +} get_kb() { download "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/main/.extra" > "$KBOUTPUT" @@ -28,7 +28,7 @@ get_xposed() { APK_PATH=$(pm path "$PACKAGE" | grep "base.apk" | cut -d':' -f2 | tr -d '\r') if [ -n "$APK_PATH" ]; then if aapt dump xmltree "$APK_PATH" AndroidManifest.xml 2>/dev/null | grep -qE "xposed.category|xposeddescription"; then - echo "$PACKAGE" >> "$OUTPUT" + echo "$PACKAGE" >>"$OUTPUT" fi fi done @@ -36,9 +36,7 @@ get_xposed() { get_unnecessary() { if [ ! -s "$OUTPUT" ] || [ ! -f "$OUTPUT" ]; then - download "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/main/more-excldue.json" 2>/dev/null | \ - grep -o '"package-name": *"[^"]*"' | \ - awk -F'"' '{print $4}' > "$OUTPUT" + download "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/main/more-exclude.json" 2>/dev/null | grep -o '"package-name": *"[^"]*"' | awk -F'"' '{print $4}' >"$OUTPUT" fi get_xposed } @@ -54,9 +52,21 @@ check_update() { fi } -case "$1" in - --kb) get_kb; exit ;; - --unnecessary) get_unnecessary; exit ;; - --xposed) get_xposed; exit ;; - --update) check_update; exit ;; +case "$1" in +--kb) + get_kb + exit + ;; +--unnecessary) + get_unnecessary + exit + ;; +--xposed) + get_xposed + exit + ;; +--update) + check_update + exit + ;; esac diff --git a/module/webui/index.js b/module/webui/index.js index 41a87f7..88aefc0 100644 --- a/module/webui/index.js +++ b/module/webui/index.js @@ -418,14 +418,8 @@ async function deselectUnnecessaryApps() { // Function to check if Magisk async function checkMagisk() { try { - const hasDenylistCondition = await execCommand(` - if [ ! -f "/data/adb/apd" ] && [ ! -f "/data/adb/ksud" ]; then - echo "OK" - else - echo "" - fi - `); - if (hasDenylistCondition.trim() === "OK") { + const magiskEnv = await execCommand(`command -v magisk >/dev/null 2>&1 && echo "OK"`); + if (magiskEnv.trim() === "OK") { console.log("Denylist conditions met, displaying element."); selectDenylistElement.style.display = "flex"; } else { @@ -798,9 +792,9 @@ document.addEventListener('DOMContentLoaded', async () => { document.getElementById("about").addEventListener("click", aboutMenu); await fetchAppList(); checkMagisk(); + updateCheck(); loadingIndicator.style.display = "none"; document.querySelector('.uninstall-container').classList.remove('hidden-uninstall'); - setTimeout(updateCheck, 0); }); // Redirect to GitHub release page diff --git a/module/webui/styles.css b/module/webui/styles.css index c0d45d7..35da527 100644 --- a/module/webui/styles.css +++ b/module/webui/styles.css @@ -352,7 +352,7 @@ body { font-size: 16px; } -.link{ +.link { flex: 0 1 auto; } @@ -777,7 +777,7 @@ body { background-color: #121212; color: #fff; } - + .header-block, .header { background-color: #121212; @@ -802,7 +802,7 @@ body { .update-card { background-color: #4D4D4D; } - + .search-card { border: 1px solid #6E6E6E; } @@ -823,7 +823,7 @@ body { .menu-options li { border-bottom: 1px solid #6E6E6E; } - + .language-option:active, .menu-options li:active, .card:active, diff --git a/more-excldue.json b/more-exclude.json similarity index 98% rename from more-excldue.json rename to more-exclude.json index d998a82..fa734ad 100644 --- a/more-excldue.json +++ b/more-exclude.json @@ -1,7 +1,7 @@ { "description": "Unnecessary app list", "repo-link": "https://github.com/KOWX712/Tricky-Addon-Update-Target-List", - "json-link": "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/main/more-excldue.json", + "json-link": "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/main/more-exclude.json", "data": [ { "info": "Root manager",