v2.5

Add more detail in help menu and clarity keybox operation prompt.

README.md

@@ -1,5 +1,5 @@
 # **Tricky Addon - Update Target List**
-An addon module for tricky store
+A **KSU WebUI** to configure tricky store target.txt
 
 ---
 ## Description
@@ -11,19 +11,18 @@ An addon module for tricky store
 - [Tricky store](https://github.com/5ec1cff/TrickyStore) module installed
 
 ## Custom Configuration
-- ADDITION and EXCLUDE in `/data/adb/tricky_store/target_list_config`
-- EXCLUDE for removing unnecessary apps
-- ADDITION for adding back system app excluded by default
-- Configuration list with **KSU WebUI** (For KernelSU and Apatch, )
+- Configuration target list with **KSU WebUI**
+- For Magisk users, first attempt perform action button can install KSU WebUI (optional).
+- Advance configure: ADDITION and EXCLUDE in `/data/adb/tricky_store/target_list_config`
 
 ## Instructions
 ### Automatic update
 - On boot
 
 ### Manually update
-**Action button method**
-- Use action button to update tricky store target list.
-- Available for Magisk 27008+, KernelSU 11981+, Apatch 10927+
+**KSU WebUI**
+- Configure target list
+- Save and Update
 
 **Manual script method**
 - Run `UpdateTargetList.sh` under `/data/adb/tricky_store` manually.
@@ -31,7 +30,7 @@ An addon module for tricky store
 
 ## More
 **Support to pass abnormal boot state**
-- Put Verfied Boot Hash to `boot_hash` in `/data/adb/modules/TA_utl`, reboot.
+- Paste Verfied Boot Hash to `boot_hash` in `/data/adb/`, reboot.
 
 ## Acknowledgement
 - [j-hc/zygisk-detach](https://github.com/j-hc/zygisk-detach) - KSU WebUI template

changelog.md

@@ -1,15 +1,52 @@
 ### Tricky Addon: Update Target List
-Automated script to update tricky store target.txt
+A **KSU WebUI** to configure tricky store target.txt
 
 Requirement: Tricky Store module installed
 
-Manually add VerifiedBootHash to /data/adb/modules/TA_utl/boot_hash (optional)
+Manually add VerifiedBootHash to /data/adb/boot_hash (optional)
 
 GitHub release: [Tricky Addon: Update Target List](https://github.com/KOWX712/Tricky-Addon-Update-Target-List/releases/latest)
 
 Telegram channel: [KOW's Little World](https://t.me/kowchannel)
 
+Starting from v2.4, WebUI will take longer time to load due to reading app name from every base.apk. The more apps installed, the longer time it takes to load the WebUI.
+
 ## Changelog
+### v2.5
+- Remove kb prompt on installation, moved into WebUI
+- Restore to AOSP keybox during uninstallation
+
+### v2.4
+- Added aapt binary for app name display
+
+**KSU WebUI**
+- Added app name display
+
+### v2.3
+- Removed curl binary
+- Moved boot_hash to /data/adb to prevent overwrite
+- Stop TSP-A auto target to prevent overwrite
+- Abandoned action button in KernelSU and Apatch
+- Magisk action button: open WebUI, automatic download if not installed (optional)
+
+**KSU WebUI**
+- Option to select app from DenyList (Magisk)
+
+### v2.2
+**KSU WebUI:**
+- Added help menu
+- Added extra [unnecessary app](https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/master/more-excldue.json) exclude option
+- Added no Internet connection prompt
+
+### v2.1
+- Added curl binary to fetch Xposed module package name from LSPosed webside
+
+- **KSU WebUI:**
+- Added feature to exclude Xposed module package name
+- Fixed abnormal color in dark mode
+- Combined save config and update target.txt button
+- Fixed some more known bugs
+
 ### v2.0
 - Added WebUI for configuration
 

lite-script_only/README.md

@@ -4,6 +4,9 @@
 - Recommend to run with MT manager
 
 ## Changelog
+### v2.1, v2.2, v2.3, v2.4, v2.5
+- Remain same with v2.0
+
 ### v2.0
 - More clarify remark in code
 - Remove useless code

lite-script_only/UpdateTargetList.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Tricky Addon Lite: Update Target List Script v2.0
+# Tricky Addon Lite: Update Target List Script v2.5
 # GitHub Repository: https://github.com/KOWX712/Tricky-Addon-Update-Target-List/blob/master/lite-script_only/README.md
 # Telegram channel: https://t.me/kowchannel
 
@@ -14,6 +14,7 @@
 EXCLUDE="
 oneplus
 coloros
+miui
 com.android.patch
 me.bmax.apatch
 me.garfieldhan.apatch.next"

module/action.sh

@@ -1,18 +1,33 @@
+MODPATH="${0%/*}"
+COMPATH="$MODPATH/common"
 SCRIPT_DIR="/data/adb/tricky_store"
 
-echo "**********************************************"
-echo "- Staring script..."
-echo " "
+. "$COMPATH/util_func.sh"
 
-if [ ! -f "$SCRIPT_DIR/UpdateTargetList.sh" ]; then
-    echo "! Script missing, please install module again"
-    echo "**********************************************"
-    exit 1
+if pm list packages | grep -q "$PACKAGE_NAME"; then
+    echo "- Launching KSU WebUI..."
+    am start -n "${PACKAGE_NAME}/.WebUIActivity" -e id "$MODID"
 else
-    . "$SCRIPT_DIR/UpdateTargetList.sh"
-fi
+    SKIP_FILE="$SCRIPT_DIR/target_list_config/skipwebui"
+    if [ ! -f "$SKIP_FILE" ]; then
+        echo "**********************************************"
+        echo "- Do you want to install KSU WebUI standalone?"
+        echo "  VOL [+]: YES"
+        echo "  VOL [-]: NO"
+        echo "**********************************************"
 
-echo "**********************************************"
-echo "\(__All set!__)/"
-echo "Exiting in 2 seconds..."
-sleep 2
+        key_check
+        if [[ "$keycheck" == "KEY_VOLUMEUP" ]]; then
+            echo "- Installing KSU WebUI..."
+            . "$COMPATH/get_WebUI.sh"
+        else
+            echo "- Skipping WebUI installation..."
+            touch "$SKIP_FILE"
+            echo "- Skip WebUI check until next installation."
+            echo ""
+            update_script
+        fi
+    else
+        update_script
+    fi
+fi

module/common/EXCLUDE

@@ -4,6 +4,7 @@
 # Each app package name should be on a new line
 oneplus
 coloros
+miui
 com.android.patch
 me.bmax.apatch
 me.garfieldhan.apatch.next

module/common/UpdateTargetList.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# This script will put all non-system app into /data/adb/tricky_store/target.txt
+# This script will put non-system app into /data/adb/tricky_store/target.txt
 CONFIG_DIR="/data/adb/tricky_store/target_list_config"
 
 echo "- Checking config files..."
@@ -20,14 +20,23 @@ else
     echo " "
 fi
 
+EXCLUDE=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/EXCLUDE" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+ADDITION=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/ADDITION" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+
+for app in $ADDITION; do
+    app=$(echo "$app" | tr -d '[:space:]')
+    if grep -Fq "$app" "$CONFIG_DIR/EXCLUDE"; then
+        sed -i "\|^$app$|d" "$CONFIG_DIR/EXCLUDE"
+    fi
+done
+
 EXCLUDE=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/EXCLUDE" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | tr '\n' '|' | sed 's/|$//')
-ADDITION=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/ADDITION")
 
 echo "- Adding apps into /data/adb/tricky_store/target.txt..."
 echo " "
-su -c pm list packages -3 </dev/null 2>&1 | cat | awk -F: '{print $2}' | grep -Ev "$EXCLUDE" > /data/adb/tricky_store/target.txt
+pm list packages -3 </dev/null 2>&1 | awk -F: '{print $2}' | grep -Ev "$EXCLUDE" > /data/adb/tricky_store/target.txt
 
-echo "- Adding addition app... "
+echo "- Adding addition app..."
 echo " "
 for app in $ADDITION; do
     app=$(echo "$app" | tr -d '[:space:]')

module/common/get_WebUI.sh

@@ -0,0 +1,28 @@
+URL="https://github.com/5ec1cff/KsuWebUIStandalone/releases/download/v1.0/KsuWebUI-1.0-34-release.apk"
+APK_DIR="$COMPATH"
+LOG_FILE="$COMPATH/webuiError.log"
+
+find_busybox
+check_wget
+
+echo "- Downloading the WebUI apk..."
+download_webui
+echo "- Download complete."
+
+APK_PATH=$(find "$APK_DIR" -type f -name "*.apk" | head -n 1)
+if [ -z "$APK_PATH" ]; then
+    echo "Error: No APK file found in $APK_DIR."
+    exit 1
+fi
+
+echo "- Installing..."
+install_webui
+echo "- Done."
+rm -f "$APK_PATH"
+echo "- Launching..."
+am start -n "${PACKAGE_NAME}/.WebUIActivity" -e id "$MODID" </dev/null 2>&1 | cat
+if [ $? -ne 0 ]; then
+    echo "Error: Failed to start application."
+    exit 1
+fi
+echo "- Application launched successfully."

module/common/get_extra.sh

@@ -0,0 +1,32 @@
+#!/system/bin/sh
+
+MODPATH=${0%/*}
+OUTPUT="$MODPATH/exclude-list"
+KBOUTPUT="$MODPATH/.extra"
+
+. $MODPATH/util_func.sh
+
+find_busybox
+check_wget
+
+# Fetch Xposed module package names
+wget --no-check-certificate -q -O - "https://modules.lsposed.org/modules.json" 2>/dev/null | \
+grep -o '"name":"[^"]*","description":' | \
+awk -F'"' '{print $4}' > "$OUTPUT"
+
+# Fetch additional package names
+wget --no-check-certificate -q -O - "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/master/more-excldue.json" 2>/dev/null | \
+grep -o '"package-name": *"[^"]*"' | \
+awk -F'"' '{print $4}' >> "$OUTPUT"
+
+if [ ! -s "$OUTPUT" ]; then
+    echo "Error: Failed to fetch data." > "$OUTPUT"
+    rm -f "$KBOUTPUT"
+    exit 1
+fi
+
+wget --no-check-certificate -qO "$KBOUTPUT" "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/master/.extra"
+
+if [ ! -s "$KBOUTPUT" ]; then
+    rm -f "$KBOUTPUT"
+fi

module/common/util_func.sh

@@ -0,0 +1,84 @@
+PACKAGE_NAME="io.github.a13e300.ksuwebui"
+MODID="set-id"
+BBPATH="/data/adb/modules/busybox-ndk/system/*/busybox \
+/data/adb/magisk/busybox \
+/data/adb/ksu/bin/busybox \
+/data/adb/ap/bin/busybox"
+            
+find_busybox() {    
+    for path in $BBPATH; do
+        if [ -f "$path" ]; then
+            BUSYBOX="$path"
+            return 0
+        fi
+    done
+    return 1
+}
+
+check_wget() {
+    if ! command -v wget >/dev/null || grep -q "wget-curl" "$(command -v wget)"; then
+        if find_busybox; then
+            wget() { "$BUSYBOX" wget "$@"; }
+        else
+            echo "Error: busybox not found." > "$OUTPUT"
+            exit 1
+        fi
+    fi
+}
+
+download_webui() {
+    wget --no-check-certificate -P "$APK_DIR" "$URL"
+    if [ $? -ne 0 ]; then
+        echo "Error: APK download failed."
+        exit 1
+    fi
+}
+
+install_webui() {
+    pm install -r "$APK_PATH" </dev/null 2>&1 | cat
+    if [ $? -ne 0 ]; then
+        echo "Error: APK installation failed."
+        rm -f "$APK_PATH"
+        exit 1
+    fi
+}
+
+key_check() {
+    while true; do
+        key_check=$(/system/bin/getevent -qlc 1)
+        key_event=$(echo "$key_check" | awk '{ print $3 }' | grep 'KEY_')
+        key_status=$(echo "$key_check" | awk '{ print $4 }')
+        if [[ "$key_event" == *"KEY_"* && "$key_status" == "DOWN" ]]; then
+            keycheck="$key_event"
+            break
+        fi
+    done
+    while true; do
+        key_check=$(/system/bin/getevent -qlc 1)
+        key_event=$(echo "$key_check" | awk '{ print $3 }' | grep 'KEY_')
+        key_status=$(echo "$key_check" | awk '{ print $4 }')
+        if [[ "$key_event" == *"KEY_"* && "$key_status" == "UP" ]]; then
+            break
+        fi
+    done
+}
+
+update_script() {
+    echo "**********************************************"
+    echo "- Starting script..."
+    echo ""
+
+    if [[ ! -f "$SCRIPT_DIR/UpdateTargetList.sh" ]]; then
+        echo "! Script missing, please install module again."
+        echo "**********************************************"
+        exit 1
+    else
+        . "$SCRIPT_DIR/UpdateTargetList.sh"
+    fi
+
+    echo "**********************************************"
+    echo ""
+    echo "\(__All set!__)/"
+    echo "Exiting in 2 seconds..."
+    sleep 2
+}

module/customize.sh

@@ -1,11 +1,20 @@
 SKIPUNZIP=0
 DEBUG=false
+COMPATH="$MODPATH/common"
+TS="/data/adb/modules/tricky_store"
+SCRIPT_DIR="/data/adb/tricky_store"
+CONFIG_DIR="$SCRIPT_DIR/target_list_config"
+MODID=`grep_prop id $TMPDIR/module.prop`
+ORG_DIR="/data/adb/modules/$MODID"
+kb="$COMPATH/.default"
 
 ui_print " ";
 if [ "$APATCH" ]; then
     ui_print "- APatch:$APATCH_VER│$APATCH_VER_CODE"
+    ACTION=false
 elif [ "$KSU" ]; then
     ui_print "- KSU:$KSU_KERNEL_VER_CODE│$KSU_VER_CODE"
+    ACTION=false
 elif [ "$MAGISK_VER_CODE" ]; then
     ui_print "- Magisk:$MAGISK_VER│$MAGISK_VER_CODE"
 else
@@ -14,134 +23,21 @@ else
     abort " "; 
 fi
 
-COMPATH="$MODPATH/common"
-TS="/data/adb/modules/tricky_store"
-SCRIPT_DIR="/data/adb/tricky_store"
-CONFIG_DIR="$SCRIPT_DIR/target_list_config"
-MODNAME=$(grep '^id=' "$MODPATH/module.prop" | awk -F= '{print $2}' | xargs)
-ORG_DIR="/data/adb/modules/$MODNAME"
-kb="$COMPATH/.default"
-
-if [ -d "$TS" ]; then
-    ui_print "- Tricky store module installed"
-else
+if [ ! -d "$TS" ]; then
     ui_print "! Tricky store module is not installed"
-    abort " " 
+    abort
 fi
 
-key_check() {
-    while true; do
-        key_check=$(/system/bin/getevent -qlc 1)
-        key_event=$(echo "$key_check" | awk '{ print $3 }' | grep 'KEY_')
-        key_status=$(echo "$key_check" | awk '{ print $4 }')
-        if [[ "$key_event" == *"KEY_"* && "$key_status" == "DOWN" ]]; then
-            keycheck="$key_event"
-            break
-        fi
-    done
-    while true; do
-        key_check=$(/system/bin/getevent -qlc 1)
-        key_event=$(echo "$key_check" | awk '{ print $3 }' | grep 'KEY_')
-        key_status=$(echo "$key_check" | awk '{ print $4 }')
-        if [[ "$key_event" == *"KEY_"* && "$key_status" == "UP" ]]; then
-            break
-        fi
-    done
-}
-
-add_exclude() {
-    EXCLUDE=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/EXCLUDE")
-    for app in $EXCLUDE; do
-        app=$(echo "$app" | tr -d '[:space:]')
-        if ! grep -Fq "$app" $COMPATH/EXCLUDE; then
-            echo "$app" >> $COMPATH/EXCLUDE
-        fi
-    done
-    mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE"
-}
-
-add_addition() {
-    ADDITION=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/ADDITION")
-    for app in $ADDITION; do
-        app=$(echo "$app" | tr -d '[:space:]')
-        if ! grep -Fq "$app" $COMPATH/ADDITION; then
-            echo "$app" >> $COMPATH/ADDITION
-        fi
-    done
-    mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION"
-}
+. "$MODPATH/install_func.sh"
 
 ui_print "- Installing..."
+initialize
 
-if [ -f "$SCRIPT_DIR/UpdateTargetList.sh" ]; then
-    rm -f "$SCRIPT_DIR/UpdateTargetList.sh"
-fi
-cp "$MODPATH/module.prop" "$COMPATH/module.prop.orig"
-mv "$COMPATH/UpdateTargetList.sh" "$SCRIPT_DIR/UpdateTargetList.sh"
+ui_print "- Creating config directory..."
+find_config
+migrate_old_boot_hash
 
-set_perm $SCRIPT_DIR/UpdateTargetList.sh 0 2000 0755
-
-if [ -d "$CONFIG_DIR" ]; then
-    if [ ! -f "$CONFIG_DIR/EXCLUDE" ] && [ ! -f "$CONFIG_DIR/ADDITION" ]; then
-        mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE"
-        mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION"
-    elif [ ! -f "$CONFIG_DIR/ADDITION" ]; then
-        mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION"
-        add_exclude
-    elif [ ! -f "$CONFIG_DIR/EXCLUDE" ]; then
-        mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE"
-        add_addition
-    else
-        add_exclude
-        add_addition
-    fi
-    ui_print "- Migrating old config data"
-else
-    ui_print "- Creating config folder $CONFIG_DIR"
-    mkdir -p "$CONFIG_DIR"
-    mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE"
-    mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION"
-fi
-
-if [ ! -f "$ORG_DIR/boot_hash" ]; then
-    mv "$COMPATH/boot_hash" "$MODPATH/boot_hash"
-else
-    rm -f "$COMPATH/boot_hash"
-    mv "$ORG_DIR/boot_hash" "$MODPATH/boot_hash"
-fi
-
-# Migrate from old version setup
-if [ -f "$ORG_DIR/system.prop" ]; then
-    hash_value=$(sed -n 's/^ro.boot.vbmeta.digest=//p' "$ORG_DIR/system.prop")
-    if [ -n "$hash_value" ]; then
-        echo -e "\n$hash_value" >> "$MODPATH/boot_hash"
-    fi
-fi
-
-ui_print "*********************************************"
-ui_print "- Do you want to replace tricky store keybox?"
-ui_print "  VOL [+]: YES"
-ui_print "  VOL [-]: NO"
-ui_print "*********************************************"
-key_check
-if [[ "$keycheck" == "KEY_VOLUMEUP" ]]; then
-    ui_print "*********************************************"
-    ui_print "- Backing up original keybox..."
-    ui_print "- Replacing keybox..."
-    ui_print "*********************************************"
-    if [ -f "$ORG_DIR/common/origkeybox" ]; then
-        mv "$ORG_DIR/common/origkeybox" "$COMPATH/origkeybox"
-    else
-        mv "$SCRIPT_DIR/keybox.xml" "$COMPATH/origkeybox"
-    fi
-    mv "$kb" "$SCRIPT_DIR/keybox.xml"
-else
-    if [ -f "$ORG_DIR/common/origkeybox" ]; then
-        mv "$ORG_DIR/common/origkeybox" "$COMPATH/origkeybox"
-    else
-        rm -f "$kb"
-    fi
-fi
+rm -f "$MODPATH/install_func.sh"
 
 ui_print "- Installation completed successfully! "
 ui_print " "

module/install_func.sh

@@ -0,0 +1,96 @@
+initialize() {
+    if [ -f "$SCRIPT_DIR/UpdateTargetList.sh" ]; then
+        rm -f "$SCRIPT_DIR/UpdateTargetList.sh"
+    fi
+    if [ -f "$CONFIG_DIR/skipwebui" ]; then
+        rm -f "$CONFIG_DIR/skipwebui"
+    fi
+    cp "$MODPATH/module.prop" "$COMPATH/module.prop.orig"
+    mv "$COMPATH/UpdateTargetList.sh" "$SCRIPT_DIR/UpdateTargetList.sh"
+
+    sed -i "s|\"set-path\"|\"/data/adb/modules/$MODID/common/\"|" "$MODPATH/webroot/index.js" || {
+        ui_print "! Failed to set path"
+        abort
+    }
+    sed -i "s|\"set-id\"|\"$MODID\"|" "$COMPATH/util_func.sh" || {
+        ui_print "! Failed to set id"
+        abort
+    }
+    
+    mkdir -p "$MODPATH/system/bin"
+    mv "$MODPATH/bin/$(getprop ro.product.cpu.abi)/aapt" "$COMPATH/aapt"
+    rm -rf "$MODPATH/bin"
+    
+    set_perm $COMPATH/aapt 0 2000 0755
+    set_perm $SCRIPT_DIR/UpdateTargetList.sh 0 2000 0755
+    set_perm $COMPATH/get_extra.sh 0 2000 0755
+    set_perm $COMPATH/get_WebUI.sh 0 2000 0755
+    
+    if [ "$ACTION" = "false" ]; then
+        rm -f "$MODPATH/action.sh"
+        rm -f "$COMPATH/get_WebUI.sh"
+    fi
+}
+
+add_exclude() {
+    EXCLUDE=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/EXCLUDE")
+    for app in $EXCLUDE; do
+        app=$(echo "$app" | tr -d '[:space:]')
+        if ! grep -Fq "$app" $COMPATH/EXCLUDE; then
+            echo "$app" >> $COMPATH/EXCLUDE
+        fi
+    done
+    mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE"
+}
+
+add_addition() {
+    ADDITION=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/ADDITION")
+    for app in $ADDITION; do
+        app=$(echo "$app" | tr -d '[:space:]')
+        if ! grep -Fq "$app" $COMPATH/ADDITION; then
+            echo "$app" >> $COMPATH/ADDITION
+        fi
+    done
+    mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION"
+}
+
+find_config() {
+    if [ -d "$CONFIG_DIR" ]; then
+        if [ ! -f "$CONFIG_DIR/EXCLUDE" ] && [ ! -f "$CONFIG_DIR/ADDITION" ]; then
+            mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE"
+            mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION"
+        elif [ ! -f "$CONFIG_DIR/ADDITION" ]; then
+            mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION"
+            add_exclude
+        elif [ ! -f "$CONFIG_DIR/EXCLUDE" ]; then
+            mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE"
+            add_addition
+        else
+            add_exclude
+            add_addition
+        fi
+    else
+        mkdir -p "$CONFIG_DIR"
+        mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE"
+        mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION"
+    fi
+}
+
+migrate_old_boot_hash() {
+    if [ ! -f "/data/adb/boot_hash" ]; then
+        if [ -f "$ORG_DIR/boot_hash" ]; then
+            mv "$ORG_DIR/boot_hash" "/data/adb/boot_hash"
+        fi
+            mv "$COMPATH/boot_hash" "/data/adb/boot_hash"
+    else
+        rm -f "$COMPATH/boot_hash"
+    fi
+
+    # Migrate from old version setup
+    if [ -f "$ORG_DIR/system.prop" ]; then
+        hash_value=$(sed -n 's/^ro.boot.vbmeta.digest=//p' "$ORG_DIR/system.prop")
+        if [ -n "$hash_value" ]; then
+            echo -e "\n$hash_value" >> "/data/adb/boot_hash"
+        fi
+    fi
+}

module/module.prop

@@ -1,7 +1,7 @@
 id=TA_utl
 name=Tricky Addon - Update Target List
-version=v2.0
-versionCode=200
+version=v2.5
+versionCode=250
 author=KOWX712
-description=Update tricky store target list with action button. Custom config: ADDITION and EXCLUDE in /data/adb/tricky_store/target_list_config
+description=A WebUI to conifgure tricky store target.txt
 updateJson=https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/master/update.json

module/service.sh

@@ -1,12 +1,20 @@
 MODPATH=${0%/*}
 TS="/data/adb/modules/tricky_store"
 SCRIPT_DIR="/data/adb/tricky_store"
+TSPA="/data/adb/modules/tsupport-advance"
 
-hash_value=$(grep -v '^#' "$MODPATH/boot_hash" | tr -d '[:space:]')
+hash_value=$(grep -v '^#' "/data/adb/boot_hash" | tr -d '[:space:]')
 if [ -n "$hash_value" ]; then
     resetprop -n ro.boot.vbmeta.digest "$hash_value"
 fi
 
+# Disable TSupport-A auto update target to prevent overwrite
+if [ -d "$TSPA" ]; then
+    touch "/storage/emulated/0/stop-tspa-auto-target"
+elif [ ! -d "$TSPA" ] && [ -f "/storage/emulated/0/stop-tspa-auto-target" ]; then
+    rm -f "/storage/emulated/0/stop-tspa-auto-target"
+fi
+
 if [ ! -f "$MODPATH/common/module.prop.orig" ]; then
     sed -i 's/^description=.*/description=Module is corrupted, please reinstall module./' "$MODPATH/module.prop"
     touch "$MODPATH/disable"

module/uninstall.sh

@@ -1,10 +1,13 @@
 MODPATH=${0%/*}
 SCRIPT_DIR="/data/adb/tricky_store"
 
-# Remove residue and restore original keybox.
+# Enable back TSupport-A auto update
+if [ -f "/storage/emulated/0/stop-tspa-auto-target" ]; then
+    rm -f "/storage/emulated/0/stop-tspa-auto-target"
+fi
+
+# Remove residue and restore aosp keybox.
 rm -rf "$SCRIPT_DIR/target_list_config"
 rm -f "$SCRIPT_DIR/UpdateTargetList.sh"
-if [ -f "$MODPATH/common/origkeybox" ]; then
-    rm -f "$SCRIPT_DIR/keybox.xml"
-    mv "$MODPATH/common/origkeybox" "$SCRIPT_DIR/keybox.xml"
-fi
+rm -f "/data/adb/boot_hash"
+xxd -r -p "$MODPATH/common/.default" | base64 -d > "$SCRIPT_DIR/keybox.xml"

module/webroot/index.html

@@ -1,44 +1,121 @@
 <!doctype html>
 <html lang="en">
+
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Document</title>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
     <link rel="stylesheet" href="/styles.css" type="text/css">
     <script type="module" crossorigin src="/index.js"></script>
 </head>
+
 <body>
-    <div id="title">Tricky Addon - Update Target List</div>
-    <div class="search-card">
-        <input type="text" class="search-input" id="search" placeholder="Search">
+    <div class="title-container">
+        <div id="title">Tricky Addon - Update Target List</div>
+        <button id="help-button" class="help-button"><i class="fa fa-question-circle"></i></button>
+        <div class="no-connection">
+            <img src="wifi-slash.svg" alt="No Connection Icon" class="wifi-icon">
+        </div>
     </div>
-    <div class="menu">
-        <input type="checkbox" id="menu-toggle" class="menu-toggle" style="display: none;">
-        <label for="menu-toggle" id="menu-button">☰</label>
-        <div id="menu-options" class="menu-options">
-            <ul>
-                <li id="refresh">Refresh</li>
-                <li id="select-all">Select All</li>
-                <li id="deselect-all">Deselect All</li>
-                <li id="update">Update Target List</li>
-            </ul>
+    <div id="help-overlay" class="help-overlay">
+        <div class="help-menu">
+            <button id="close-help" class="close-help">&#x2715;</button>
+            <div class="help-content">
+                <p>Instructions</p>
+                <ul>
+                    <li>Save and Update
+                        <ul>
+                            <li>Save the current configuration and update target.txt immediately.</li>
+                            <li><br></li>
+                        </ul>
+                    </li>
+                    <li>Refresh
+                        <ul>
+                            <li>Refresh app list and exclude list.</li>
+                            <li><br></li>
+                        </ul>
+                    </li>
+                    <li>Select All & Deselect All
+                        <ul>
+                            <li>Select or deselect all apps in the current interface.</li>
+                            <li><br></li>
+                        </ul>
+                    </li>
+                    <li>Select From DenyList
+                        <ul>
+                            <li>Available in Magisk only, select apps that in the DenyList. Recommended.</li>
+                            <li><br></li>
+                        </ul>
+                    </li>
+                    <li>Deselect Unnecessary
+                        <ul>
+                            <li>Unnecessary category: Xposed module, root manager, root-related apps, and general apps
+                                that never check bootloader status. This option requrie Internet connection.</li>
+                            <ul>
+                                <li>Contribute to <a
+                                        href="https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/master/more-excldue.json"
+                                        target="_blank">unnecessary app list</a>? Create an <a
+                                        href="https://github.com/KOWX712/Tricky-Addon-Update-Target-List/issues"
+                                        target="_blank">issue</a> or <a
+                                        href="https://github.com/KOWX712/Tricky-Addon-Update-Target-List/pulls"
+                                        target="_blank">pull request</a>.</li>
+                            </ul>
+                            <li><br></li>
+                        </ul>
+                    </li>
+                    <li>Set AOSP & Valid Keybox
+                        <ul>
+                            <li>Replace tricky store keybox.xml<br><strong>AOSP keybox:</strong> Device
+                                Integrity.<br><strong>Valid keybox:</strong> Strong Integrity, fallback to Basic
+                                Integrity if revoked.<br>AOSP keybox will be replaced if there's no more valid keybox.
+                                Valid keybox option require Internet connection.</li>
+                            <li><br></li>
+                        </ul>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div class="search-menu-container">
+        <div class="search-card">
+            <span class="search-icon"><i class="fa fa-search"></i></span>
+            <input type="text" class="search-input" id="search" placeholder="Search">
+            <button class="clear-btn" id="clear-btn">&#x2715;</button>
+        </div>
+        <div class="menu">
+            <input type="checkbox" id="menu-toggle" class="menu-toggle">
+            <label for="menu-toggle" id="menu-button">
+                <span class="menu-icon"><i class="fa fa-bars"></i></span>
+            </label>
+            <div id="menu-options" class="menu-options">
+                <ul>
+                    <li id="refresh">Refresh</li>
+                    <li id="select-all">Select All</li>
+                    <li id="deselect-all">Deselect All</li>
+                    <li id="select-denylist">Select From DenyList</li>
+                    <li id="deselect-unnecessary">Deselect Unnecessary</li>
+                    <li id="aospkb">Set AOSP Keybox</li>
+                    <li id="extrakb">Set Valid Keybox</li>
+                </ul>
+            </div>
         </div>
     </div>
     <div id="apps-list"></div>
     <div class="floating-card">
-        <button class="floating-btn" id="save">Save Config</button>
-    </div> 
+        <button class="floating-btn" id="save">Save and Update</button>
+    </div>
     <template id="app-template">
         <div class="card" onclick="toggleCheckbox(event)">
-            <div class="content">
+            <div class="content" data-package="">
                 <p class="name"></p>
                 <input type="checkbox" class="checkbox" checked>
             </div>
         </div>
     </template>
-    <div class="acknowledgment">
-        Credit to j-hc/zygisk-detach WebUI
-    </div>
+    <div class="loading">Loading...</div>
+    <div class="acknowledgment">Credit to j-hc/zygisk-detach WebUI</div>
     <div id="prompt" class="prompt"></div>
 </body>
+
 </html>

module/webroot/index.js

@@ -1,7 +1,22 @@
 let e = 0;
 const appTemplate = document.getElementById("app-template").content;
 const appListContainer = document.getElementById("apps-list");
+const loadingIndicator = document.querySelector(".loading");
+const searchMenuContainer = document.querySelector('.search-menu-container');
+const searchInput = document.getElementById("search");
+const clearBtn = document.getElementById("clear-btn");
+const title = document.querySelector('.title-container');
+const noConnection = document.querySelector(".no-connection");
+const helpButton = document.getElementById("help-button");
+const helpOverlay = document.getElementById("help-overlay");
+const closeHelp = document.getElementById("close-help");
+const searchCard = document.querySelector('.search-card');
+const menu = document.querySelector('.menu');
+const selectDenylistElement = document.getElementById("select-denylist");
+const floatingBtn = document.querySelector('.floating-btn');
+const basePath = "set-path";
 let excludeList = [];
+let isRefreshing = false;
 
 // Function to execute shell commands
 async function execCommand(command) {
@@ -36,101 +51,240 @@ async function readExcludeFile() {
     }
 }
 
-// Function to fetch the app list using the package manager
+// Helper function to check if an app name should be excluded
+function isExcluded(appName) {
+    return excludeList.some(excludeItem => appName.includes(excludeItem));
+}
+
+// Function to fetch, sort, and render the app list with app names
 async function fetchAppList() {
     try {
-        const result = await execCommand("pm list packages -3 </dev/null 2>&1 | cat");
-        return result.split("\n").map(line => line.replace("package:", "").trim()).filter(Boolean);
+        await readExcludeFile();
+        const result = await execCommand(`
+            pm list packages -3 | while read -r line; do
+                PACKAGE=$(echo "$line" | awk -F: '{print $2}')
+                APK_PATH=$(pm path "$PACKAGE" | grep "base.apk" | awk -F: '{print $2}' | tr -d '\\r')
+                if [ -n "$APK_PATH" ]; then
+                    APP_NAME=$( ${basePath}aapt dump badging "$APK_PATH" 2>/dev/null | grep "application-label:" | sed "s/application-label://; s/'//g" )
+                    echo "$APP_NAME|$PACKAGE"
+                else
+                    echo "Unknown App|$PACKAGE"
+                fi
+            done
+        `);
+        const appEntries = result.split("\n").map(line => {
+            const [appName, packageName] = line.split("|").map(item => item.trim());
+            return { appName, packageName };
+        }).filter(entry => entry.packageName); // Remove invalid entries
+        const sortedApps = appEntries.sort((a, b) => {
+            const aInExclude = isExcluded(a.packageName);
+            const bInExclude = isExcluded(b.packageName);
+            return aInExclude === bInExclude ? a.appName.localeCompare(b.appName) : aInExclude ? 1 : -1;
+        });
+        appListContainer.innerHTML = ""; // Clear the container before rendering
+        sortedApps.forEach(({ appName, packageName }) => {
+            const appElement = document.importNode(appTemplate, true);
+            const contentElement = appElement.querySelector(".content");
+            contentElement.setAttribute("data-package", packageName);
+            const nameElement = appElement.querySelector(".name");
+            nameElement.innerHTML = `<strong>${appName || "Unknown App"}</strong><br>${packageName}`;
+            const checkbox = appElement.querySelector(".checkbox");
+            checkbox.checked = !isExcluded(packageName);
+            appListContainer.appendChild(appElement);
+        });
+        console.log("App list with names and packages rendered successfully.");
     } catch (error) {
-        console.error("Failed to fetch app list:", error);
-        return [];
+        console.error("Failed to fetch or render app list with names:", error);
+    }
+
+    floatingBtn.style.transform = "translateY(-100px)";
+}
+
+// Function to refresh app list
+async function refreshAppList() {
+    isRefreshing = true;
+    title.style.transform = 'translateY(0)';
+    searchMenuContainer.style.transform = 'translateY(0)';
+    floatingBtn.style.transform = 'translateY(0)';
+    searchInput.value = '';
+    clearBtn.style.display = "none";
+    appListContainer.innerHTML = '';
+    loadingIndicator.style.display = 'flex';
+    await new Promise(resolve => setTimeout(resolve, 500));
+    window.scrollTo(0, 0);
+    if (noConnection.style.display === "flex") {
+        await runExtraScript();
+    }
+    await fetchAppList();[]
+    loadingIndicator.style.display = 'none';
+    isRefreshing = false;
+}
+
+// Function to select all visible apps
+function selectAllApps() {
+    document.querySelectorAll(".card").forEach(card => {
+        if (card.style.display !== "none") {
+            card.querySelector(".checkbox").checked = true;
+        }
+    });
+}
+
+// Function to deselect all visible apps
+function deselectAllApps() {
+    document.querySelectorAll(".card").forEach(card => {
+        if (card.style.display !== "none") {
+            card.querySelector(".checkbox").checked = false;
+        }
+    });
+}
+
+// Function to run the extra script
+async function runExtraScript() {
+    try {
+        const scriptPath = `${basePath}get_extra.sh`;
+        await execCommand(scriptPath);
+        console.log("Extra script executed successfully.");
+        noConnection.style.display = "none";
+    } catch (error) {
+        console.error("Failed to execute Extra script:", error);
+        showPrompt("Please check your Internet connection", false);
+        noConnection.style.display = "flex";
     }
 }
 
-// Function to render apps
-async function renderAppList() {
-    await readExcludeFile();
-    const apps = await fetchAppList();
-    const sortedApps = apps.sort((a, b) => {
-        const aInExclude = excludeList.includes(a);
-        const bInExclude = excludeList.includes(b);
-        return aInExclude === bInExclude ? a.localeCompare(b) : aInExclude ? 1 : -1;
-    });
-    appListContainer.innerHTML = "";
-    sortedApps.forEach(appName => {
-        const appElement = document.importNode(appTemplate, true);
-        appElement.querySelector(".name").textContent = appName;
-        const checkbox = appElement.querySelector(".checkbox");
-        checkbox.checked = !excludeList.includes(appName);
-        appListContainer.appendChild(appElement);
-    });
+// Function to read the exclude list and uncheck corresponding apps
+async function deselectUnnecessaryApps() {
+    try {
+        const result = await execCommand(`cat ${basePath}exclude-list`);
+        const UnnecessaryApps = result.split("\n").map(app => app.trim()).filter(Boolean);
+        const apps = document.querySelectorAll(".card");
+        apps.forEach(app => {
+            const contentElement = app.querySelector(".content");
+            const packageName = contentElement.getAttribute("data-package");
+            const checkbox = app.querySelector(".checkbox");
+            if (UnnecessaryApps.includes(packageName)) {
+                checkbox.checked = false; // Uncheck if found in more-exclude list
+            }
+        });
+        console.log("unnecessary apps deselected successfully.");
+    } catch (error) {
+        console.error("Failed to deselect unnecessary apps:", error);
+    }
 }
 
-// Function to refresh the app list and clear the search input
-async function refreshAppList() {
-    const searchInput = document.getElementById("search");
-    searchInput.value = '';
-    const apps = appListContainer.querySelectorAll(".card");
-    apps.forEach(app => app.style.display = "block");
-    await renderAppList();
+// 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") {
+            console.log("Denylist conditions met, displaying element.");
+            selectDenylistElement.style.display = "flex";
+        } else {
+            console.log("ksud or apd detected, leaving denylist element hidden.");
+        }
+    } catch (error) {
+        console.error("Error while checking denylist conditions:", error);
+    }
 }
 
-// Function to select all apps
-function selectAllApps() {
-    document.querySelectorAll(".checkbox").forEach(checkbox => checkbox.checked = true);
+// Function to read the denylist and check corresponding apps
+async function selectDenylistApps() {
+    try {
+        const result = await execCommand(`
+            magisk --denylist ls 2>/dev/null | \
+            awk -F'|' '{print $1}' | \
+            grep -v "isolated" | \
+            sort | uniq
+        `);
+        const denylistApps = result.split("\n").map(app => app.trim()).filter(Boolean);
+        const apps = document.querySelectorAll(".card");
+        await deselectAllApps();
+        apps.forEach(app => {
+            const contentElement = app.querySelector(".content");
+            const packageName = contentElement.getAttribute("data-package");
+            const checkbox = app.querySelector(".checkbox");
+            if (denylistApps.includes(packageName)) {
+                checkbox.checked = true; // Select the app if found in denylist
+            }
+        });
+        console.log("Denylist apps selected successfully.");
+    } catch (error) {
+        console.error("Failed to select Denylist apps:", error);
+    }
 }
 
-// Function to deselect all apps
-function deselectAllApps() {
-    document.querySelectorAll(".checkbox").forEach(checkbox => checkbox.checked = false);
+// Function to replace aosp kb
+async function aospkb() {
+    try {
+        const sourcePath = `${basePath}.default`;
+        const destinationPath = "/data/adb/tricky_store/keybox.xml";
+        await execCommand(`xxd -r -p ${sourcePath} | base64 -d > ${destinationPath}`);
+        console.log("AOSP keybox copied successfully.");
+        showPrompt("AOSP keybox set successfully.");
+    } catch (error) {
+        console.error("Failed to copy AOSP keybox:", error);
+        showPrompt("Failed to update keybox.", false);
+    }
 }
 
-let promptTimeout; // Variable to store the current timeout
+// Function to replace valid kb
+async function extrakb() {
+    const sourcePath = `${basePath}.extra`;
+    const destinationPath = "/data/adb/tricky_store/keybox.xml";
+    try {
+        const fileExists = await execCommand(`[ -f ${sourcePath} ] && echo "exists"`);
+        if (fileExists.trim() !== "exists") {
+            throw new Error(".extra file not found");
+        }
+        await execCommand(`xxd -r -p ${sourcePath} | base64 -d > ${destinationPath}`);
+        console.log("Valid keybox copied successfully.");
+        showPrompt("Valid keybox set successfully.");
+    } catch (error) {
+        console.error("Failed to copy valid keybox:", error);
+        await aospkb();
+        showPrompt("No valid keybox found, replaced with AOSP keybox.", false);
+    }
+}
 
 // Function to show the prompt with a success or error message
 function showPrompt(message, isSuccess = true) {
     const prompt = document.getElementById('prompt');
     prompt.textContent = message;
-    prompt.classList.toggle('error', !isSuccess); // Apply error class if not success
-    prompt.style.display = 'block';
-
-    if (promptTimeout) {
-        clearTimeout(promptTimeout);
+    prompt.classList.toggle('error', !isSuccess);
+    if (window.promptTimeout) {
+        clearTimeout(window.promptTimeout);
     }
-
-    promptTimeout = setTimeout(() => {
-        prompt.style.display = 'none';
-    }, 2000);
+    setTimeout(() => {
+        prompt.classList.add('visible');
+        prompt.classList.remove('hidden');
+        window.promptTimeout = setTimeout(() => {
+            prompt.classList.remove('visible');
+            prompt.classList.add('hidden');
+        }, 3000);
+    }, 500);
 }
 
-// Function to update the target list by executing a script
-async function updateTargetList() {
-    try {
-        await execCommand("/data/adb/tricky_store/UpdateTargetList.sh");
-        showPrompt("Successfully updated target.txt");
-    } catch (error) {
-        console.error("Failed to update target list:", error);
-        showPrompt("Failed to update target.txt !", false);
-    }
-}
-
-// Menu toggle functionality
+// Function to toggle menu option
 function setupMenuToggle() {
     const menuButton = document.getElementById('menu-button');
+    const menuIcon = menuButton.querySelector('.menu-icon');
     const menuOptions = document.getElementById('menu-options');
+    let menuOpen = false;
+    let menuAnimating = false;
 
     menuButton.addEventListener('click', (event) => {
+        if (menuAnimating) return;
         event.stopPropagation();
         if (menuOptions.classList.contains('visible')) {
             closeMenu();
         } else {
-            menuOptions.style.display = 'block';
-            setTimeout(() => {
-                menuOptions.classList.remove('hidden');
-                menuOptions.classList.add('visible');
-                menuButton.classList.add('menu-open');
-                menuButton.classList.remove('menu-closed');
-            }, 10);
+            openMenu();
         }
     });
 
@@ -140,7 +294,13 @@ function setupMenuToggle() {
         }
     });
 
-    const closeMenuItems = ['refresh', 'select-all', 'deselect-all', 'update'];
+    window.addEventListener('scroll', () => {
+        if (menuOptions.classList.contains('visible')) {
+            closeMenu();
+        }
+    });
+
+    const closeMenuItems = ['refresh', 'select-all', 'deselect-all', 'select-denylist', 'deselect-unnecessary', 'aospkb', 'extrakb'];
     closeMenuItems.forEach(id => {
         const item = document.getElementById(id);
         if (item) {
@@ -151,92 +311,169 @@ function setupMenuToggle() {
         }
     });
 
+    function openMenu() {
+        menuAnimating = true;
+        menuOptions.style.display = 'block';
+        setTimeout(() => {
+            menuOptions.classList.remove('hidden');
+            menuOptions.classList.add('visible');
+            menuIcon.classList.add('menu-open');
+            menuIcon.classList.remove('menu-closed');
+            menuOpen = true;
+            menuAnimating = false;
+        }, 10);
+    }
+
     function closeMenu() {
         if (menuOptions.classList.contains('visible')) {
+            menuAnimating = true;
             menuOptions.classList.remove('visible');
             menuOptions.classList.add('hidden');
-            menuButton.classList.remove('menu-open');
-            menuButton.classList.add('menu-closed');
+            menuIcon.classList.remove('menu-open');
+            menuIcon.classList.add('menu-closed');
             setTimeout(() => {
                 menuOptions.style.display = 'none';
-            }, 300);
+                menuOpen = false;
+                menuAnimating = false;
+            }, 200);
         }
     }
 }
 
+// Focus on search input when search card is clicked
+searchCard.addEventListener("click", () => {
+    searchInput.focus();
+});
+
 // Search functionality
-document.getElementById("search").addEventListener("input", (e) => {
+searchInput.addEventListener("input", (e) => {
     const searchQuery = e.target.value.toLowerCase();
     const apps = appListContainer.querySelectorAll(".card");
     apps.forEach(app => {
         const name = app.querySelector(".name").textContent.toLowerCase();
         app.style.display = name.includes(searchQuery) ? "block" : "none";
+        window.scrollTo(0, 0);
+    });
+    if (searchQuery !== "") {
+        clearBtn.style.display = "block";
+    } else {
+        clearBtn.style.display = "none";
+    }
+});
+
+// Clear search input
+clearBtn.addEventListener("click", () => {
+    searchInput.value = "";
+    clearBtn.style.display = "none";
+    window.scrollTo(0, 0);
+    const apps = appListContainer.querySelectorAll(".card");
+    apps.forEach(app => {
+        app.style.display = "block";
     });
 });
 
-// Add button click event to update EXCLUDE file
+// Add button click event to update EXCLUDE file and run UpdateTargetList.sh
 document.getElementById("save").addEventListener("click", async () => {
     await readExcludeFile();
     const deselectedApps = Array.from(appListContainer.querySelectorAll(".checkbox:not(:checked)"))
-        .map(checkbox => checkbox.closest(".card").querySelector(".name").textContent);
+        .map(checkbox => checkbox.closest(".card").querySelector(".content").getAttribute("data-package"));
     const selectedApps = Array.from(appListContainer.querySelectorAll(".checkbox:checked"))
-        .map(checkbox => checkbox.closest(".card").querySelector(".name").textContent);
-
-    for (const app of deselectedApps) {
-        if (!excludeList.includes(app)) {
-            excludeList.push(app);
-            console.log("Added to EXCLUDE list:", app);
+        .map(checkbox => checkbox.closest(".card").querySelector(".content").getAttribute("data-package"));
+    // Add deselected apps to EXCLUDE list
+    for (const packageName of deselectedApps) {
+        if (!excludeList.includes(packageName)) {
+            excludeList.push(packageName);
+            console.log("Added to EXCLUDE list:", packageName);
         } else {
-            console.log("App already in EXCLUDE file, skipping:", app);
+            console.log("Package already in EXCLUDE file, skipping:", packageName);
         }
     }
-
+    // Remove selected apps from EXCLUDE list
     if (selectedApps.length > 0) {
-        selectedApps.forEach(app => {
-            excludeList = excludeList.filter(excludedApp => excludedApp !== app);
-            console.log("Removed from EXCLUDE list:", app);
+        selectedApps.forEach(packageName => {
+            excludeList = excludeList.filter(excludedPackage => excludedPackage !== packageName);
+            console.log("Removed from EXCLUDE list:", packageName);
         });
     }
-
     try {
+        // Save the EXCLUDE file
         const updatedExcludeContent = excludeList.join("\n");
         await execCommand(`echo "${updatedExcludeContent}" > /data/adb/tricky_store/target_list_config/EXCLUDE`);
         console.log("EXCLUDE file updated successfully.");
-        showPrompt("Config saved successfully");
+
+        // Execute UpdateTargetList.sh
+        try {
+            await execCommand("/data/adb/tricky_store/UpdateTargetList.sh");
+            showPrompt("Config and target.txt updated");
+        } catch (error) {
+            console.error("Failed to update target list:", error);
+            showPrompt("Config saved, but failed to update target list", false);
+        }
     } catch (error) {
         console.error("Failed to update EXCLUDE file:", error);
         showPrompt("Failed to save config", false);
     }
     await readExcludeFile();
+    await refreshAppList();
 });
 
-// Event listener for the "Update Target List" menu option
-document.getElementById('update').addEventListener('click', updateTargetList);
-
 // Initial load
-document.addEventListener('DOMContentLoaded', () => {
+document.addEventListener('DOMContentLoaded', async () => {
     setupMenuToggle();
     document.getElementById("refresh").addEventListener("click", refreshAppList);
     document.getElementById("select-all").addEventListener("click", selectAllApps);
     document.getElementById("deselect-all").addEventListener("click", deselectAllApps);
-    renderAppList();
+    document.getElementById("select-denylist").addEventListener("click", selectDenylistApps);
+    document.getElementById("deselect-unnecessary").addEventListener("click", deselectUnnecessaryApps);
+    document.getElementById("aospkb").addEventListener("click", aospkb);
+    document.getElementById("extrakb").addEventListener("click", extrakb);
+    await fetchAppList();
+    checkMagisk();
+    runExtraScript();
+    loadingIndicator.style.display = "none";
 });
 
 // Scroll event
 let lastScrollY = window.scrollY;
-const title = document.getElementById('title');
-const searchCard = document.querySelector('.search-card');
-const menu = document.querySelector('.menu');
-
+const scrollThreshold = 35;
 window.addEventListener('scroll', () => {
-    if (window.scrollY > lastScrollY) {
+    if (isRefreshing) return;
+    if (window.scrollY > lastScrollY && window.scrollY > scrollThreshold) {
         title.style.transform = 'translateY(-100%)';
-        searchCard.style.transform = 'translateY(-40px)';
-        menu.style.transform = 'translateY(-40px)';
-    } else {
+        searchMenuContainer.style.transform = 'translateY(-35px)';
+        floatingBtn.style.transform = 'translateY(0)';
+    } else if (window.scrollY < lastScrollY) {
         title.style.transform = 'translateY(0)';
-        searchCard.style.transform = 'translateY(0)';
-        menu.style.transform = 'translateY(0)';
+        searchMenuContainer.style.transform = 'translateY(0)';
+        floatingBtn.style.transform = 'translateY(-100px)';
     }
     lastScrollY = window.scrollY;
+});
+
+// Show help overlay
+helpButton.addEventListener("click", () => {
+    helpOverlay.classList.remove("hide");
+    helpOverlay.style.display = "flex";
+    requestAnimationFrame(() => {
+        helpOverlay.classList.add("show");
+    });
+    document.body.classList.add("no-scroll");
+});
+
+// Hide help overlay
+const hideHelpOverlay = () => {
+    helpOverlay.classList.remove("show");
+    helpOverlay.classList.add("hide");
+    document.body.classList.remove("no-scroll");
+    setTimeout(() => {
+        helpOverlay.style.display = "none";
+    }, 200);
+};
+
+// Hide when clicking on close button or outside of the overlay content
+closeHelp.addEventListener("click", hideHelpOverlay);
+helpOverlay.addEventListener("click", (event) => {
+    if (event.target === helpOverlay) {
+        hideHelpOverlay();
+    }
 });

module/webroot/styles.css

@@ -2,58 +2,194 @@ body {
     background-color: #F5F5F5;
 }
 
-#title {
+.no-scroll {
+    overflow: hidden;
+}
+
+.title-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    position: fixed;
+    top: 0;
+    height: 40px;
+    width: calc(100% - 17px);
     background-color: #F5F5F5;
-    border: none;
+    transition: transform 0.3s ease;
+    z-index: 1000;
+}
+
+#title {
     font-size: 18px;
     font-weight: bold;
-    left: 0;
-    padding: 7px 25px;
+    padding-left: 10px;
+}
+
+.no-connection {
+    display: none;
+    align-items: center;
+    color: #7E7E7E;
+}
+
+.no-connection .wifi-icon {
+    width: 20px;
+    height: 20px;
+    margin-right: 5px;
+    filter: invert(0.6) sepia(0) saturate(0) hue-rotate(180deg) brightness(0.8) contrast(1);
+}
+
+.help-button {
+    margin-right: auto;
+    padding: 0 10px;
+    background: none;
+    border: none;
+    font-size: 24px;
+    align-items: center;
+    justify-content: center;
+}
+
+.help-overlay {
+    display: none;
     position: fixed;
-    text-align: left;
     top: 0;
-    transition: transform 0.3s ease;
-    width: 100%;
-    z-index: 1000;
+    left: 0;
+    width: 100vw;
+    height: 100vh;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 2000;
+    justify-content: center;
+    align-items: center;
+    opacity: 0;
+    transition: opacity 0.2s ease;
+}
+
+.help-overlay.show {
+    display: flex;
+    opacity: 1;
+}
+
+.help-overlay.hide {
+    opacity: 0;
+}
+
+.help-menu {
+    position: relative;
+    width: 75vw;
+    max-width: 800px;
+    background-color: white;
+    padding: 0 10px;
+    border-radius: 15px;
+    text-align: left;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3);
+}
+
+.close-help {
+    position: absolute;
+    top: 15px;
+    right: 12px;
+    background: none;
+    border: none;
+    font-size: 20px;
+    color: #ccc;
+}
+
+.help-content {
+    max-height: 85vh;
+    padding: 0 20px;
+    overflow-y: auto;
+}
+
+.help-content p {
+    font-size: 26px;
+}
+
+.help-content ul {
+    padding-left: 0;
+    list-style-type: none;
+}
+
+.help-content ul li {
+    font-weight: bold;
+    font-size: 18px;
+}
+
+.help-content ul ul li {
+    font-weight: normal;
+    font-size: 16px;
+}
+
+.help-content ul ul ul li {
+    color: #777777;
+    font-weight: normal;
+    font-size: 14px;
+}
+
+.help-content ul ul ul li a {
+    color: inherit;
 }
 
 #apps-list {
     margin-top: 100px;
 }
 
+.search-menu-container {
+    display: flex;
+    position: fixed;
+    top: 40px;
+    height: 50px;
+    width: calc(100% - 17px);
+    z-index: 1000;
+    transition: transform 0.3s ease;
+}
+
 .search-card {
     background-color: white;
     border: 1px solid #ccc;
-    border-radius: 25px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
     display: flex;
     align-items: center;
-    padding: 10px;
-    position: fixed;
-    top: 40px;
-    transition: transform 0.3s ease;
-    width: calc(100% - 100px);
+    border-radius: 50px;
+    left: 0;
+    height: calc(100% - 2px);
+    width: calc(100% - 60px);
+    position: absolute;
+}
+
+.search-icon {
+    position: absolute;
+    left: 18px;
+    font-size: 15px;
     z-index: 1000;
 }
 
+
 .search-input {
-    background-color: #fff;
+    position: absolute;
     border: none;
-    box-sizing: border-box;
-    font-size: 14px;
+    font-size: 17px;
     outline: none;
-    padding: 5px 15px;
-    text-align: left;
-    width: 100%;
+    left: 10px;
+    padding: 0 30px;
+    width: calc(100% - 10);
+}
+
+.clear-btn {
+    position: absolute;
+    color: #ccc;
+    right: 10px;
+    border: none;
+    background: none;
+    font-size: 18px;
+    cursor: pointer;
+    display: none;
+    z-index: 10;
 }
 
 .menu {
     display: flex;
-    position: fixed;
-    top: 40px;
-    right: 10px;
-    z-index: 1000;
-    transition: transform 0.3s ease;
+    right: 0;
+    position: absolute;
+    height: 100%;
 }
 
 .menu-toggle {
@@ -63,11 +199,25 @@ body {
 #menu-button {
     background-color: white;
     border: 1px solid #ccc;
-    border-radius: 25px;
+    border-radius: 50%;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-    padding: 13px 17px;
-    text-align: center;
-    transition: transform 0.3s ease;
+    width: 48px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.menu-icon {
+    display: inline-block;
+    transition: transform 0.2s ease;
+}
+
+.menu-icon.menu-open {
+    transform: rotate(90deg);
+}
+
+.menu-icon.menu-closed {
+    transform: rotate(0deg);
 }
 
 .menu-options {
@@ -77,11 +227,17 @@ body {
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
     display: none;
     position: absolute;
+    padding: 5px;
     top: 110%;
     right: 0;
-    transform: translateX(100%);
-    transition: transform 0.3s ease;
-    width: 170px;
+    transform: translateX(120%);
+    transition: transform 0.2s ease;
+    width: auto;
+    white-space: nowrap;
+}
+
+#select-denylist {
+    display: none;
 }
 
 .menu-options.visible {
@@ -90,7 +246,7 @@ body {
 }
 
 .menu-options.hidden {
-    transform: translateX(110%);
+    transform: translateX(140%);
 }
 
 .menu-options ul {
@@ -100,19 +256,11 @@ body {
 }
 
 .menu-options li {
-    cursor: pointer;
-    padding: 15px 16px;
+    cursor: default;
+    padding: 15px 12px;
     text-align: left;
 }
 
-.menu-open {
-    transform: rotate(90deg);
-}
-
-.menu-closed {
-    transform: rotate(0deg);
-}
-
 .card {
     background-color: white;
     border: none;
@@ -141,29 +289,66 @@ body {
 }
 
 .prompt {
+    position: fixed;
+    bottom: 0;
+    left: 10px;
     background-color: #4CAF50;
     border-radius: 8px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
     color: white;
-    display: none;
     font-size: 15px;
-    left: 10px;
     padding: 5px 15px;
-    position: fixed;
-    bottom: 15px;
     z-index: 1000;
-    transition: opacity 1s ease;
+    transform: translateY(100%);
+    transition: transform 0.5s ease;
+    white-space: nowrap;
+}
+
+.prompt.visible {
+    animation: YbounceIn 0.4s forwards;
+}
+
+.prompt.hidden {
+    animation: YbounceOut 0.4s forwards;
 }
 
 .prompt.error {
     background-color: #f44336;
 }
 
+@keyframes YbounceIn {
+    0% {
+        transform: translateY(100%);
+    }
+
+    50% {
+        transform: translateY(-80%);
+    }
+
+    100% {
+        transform: translateY(-60%);
+    }
+}
+
+@keyframes YbounceOut {
+    0% {
+        transform: translateY(-60%);
+    }
+
+    50% {
+        transform: translateY(-80%);
+    }
+
+    100% {
+        transform: translateY(100%);
+    }
+}
+
 .floating-card {
     display: flex;
     justify-content: center;
     position: fixed;
-    bottom: 45px;
+    bottom: -50px;
     left: 50%;
     transform: translateX(-50%);
     z-index: 3;
@@ -172,15 +357,27 @@ body {
 .floating-btn {
     background-color: #007bff;
     border: none;
-    border-radius: 24px;
     box-shadow: 0 4px 8px #0003;
     color: #fff;
     display: flex;
     justify-content: center;
     align-items: center;
-    padding: 10px 20px;
-    font-size: 16px;
-    transition: transform .3s ease-in-out;
+    padding: 12px 17px;
+    font-size: 17px;
+    transition: transform 0.3s ease-in-out;
+    border-top-left-radius: 50px;
+    border-top-right-radius: 50px;
+    border-bottom-left-radius: 50px;
+    border-bottom-right-radius: 50px;
+}
+
+.loading {
+    color: #6E6E6E;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: calc(100vh - 164px);
+    font-size: 24px;
 }
 
 .acknowledgment {
@@ -196,10 +393,15 @@ body {
         color: #eee;
     }
 
-    #title {
+    .title-container {
         background-color: #121212;
     }
 
+    .help-button {
+        color: #fff;
+    }
+
+    .help-menu,
     .card,
     .search-input,
     .search-card {
@@ -209,7 +411,11 @@ body {
     .search-card {
         border: 1px solid #6E6E6E;
     }
-    
+
+    .search-input {
+        color: white;
+    }
+
     .menu-options,
     #menu-button {
         background-color: #343434;

module/webroot/wifi-slash.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M6.92,5.51h0L3.71,2.29A1,1,0,0,0,2.29,3.71L4.56,6A15.21,15.21,0,0,0,1.4,8.39a1,1,0,0,0,0,1.41,1,1,0,0,0,.71.3,1,1,0,0,0,.7-.29A13.07,13.07,0,0,1,6.05,7.46L7.54,9a10.78,10.78,0,0,0-3.32,2.27,1,1,0,1,0,1.42,1.4,8.8,8.8,0,0,1,3.45-2.12l1.62,1.61a7.07,7.07,0,0,0-3.66,1.94,1,1,0,1,0,1.42,1.4A5,5,0,0,1,12,14a4.13,4.13,0,0,1,.63.05l7.66,7.66a1,1,0,0,0,1.42,0,1,1,0,0,0,0-1.42ZM12,16a3,3,0,1,0,3,3A3,3,0,0,0,12,16Zm0,4a1,1,0,1,1,1-1A1,1,0,0,1,12,20ZM22.61,8.39A15,15,0,0,0,10.29,4.1a1,1,0,1,0,.22,2A13.07,13.07,0,0,1,21.2,9.81a1,1,0,0,0,1.41-1.42Zm-4.25,4.24a1,1,0,0,0,1.42-1.4,10.75,10.75,0,0,0-4.84-2.82,1,1,0,1,0-.52,1.92A8.94,8.94,0,0,1,18.36,12.63Z"/></svg>

more-excldue.json

@@ -0,0 +1,116 @@
+{
+    "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/master/more-excldue.json",
+    "data": [
+        {
+            "info": "Root manager",
+            "apps": [
+                {
+                    "name": "Magisk",
+                    "package-name": "com.topjohnwu.magisk"
+                },
+                {
+                    "name": "Magisk Alpha",
+                    "package-name": "io.github.vvb2060.magisk"
+                },
+                {
+                    "name": "Kitsune Mask",
+                    "package-name": "io.github.huskydg.magisk"
+                },
+                {
+                    "name": "KernelSU",
+                    "package-name": "me.weishu.kernelsu"
+                },
+                {
+                    "name": "Apatch",
+                    "package-name": "me.bmax.apatch"
+                },
+                {
+                    "name": "Apatch Next",
+                    "package-name": "me.garfieldhan.apatch.next"
+                }
+            ]
+        },
+        {
+            "info": "Root related app that won't detect bootloader",
+            "apps": [
+                {
+                    "name": "LSPosed Manager",
+                    "package-name": "org.lsposed.manager"
+                },
+                {
+                    "name": "Termux",
+                    "package-name": "com.termux"
+                },
+                {
+                    "name": "MT Manager",
+                    "package-name": "bin.mt.plus"
+                },
+                {
+                    "name": "MT Manager clone",
+                    "package-name": "bin.mt.plus.canary"
+                },
+                {
+                    "name": "KonaBess",
+                    "package-name": "xzr.konabess"
+                },
+                {
+                    "name": "KsuWebUI",
+                    "package-name": "io.github.a13e300.ksuwebui"
+                },
+                {
+                    "name": "ShortX",
+                    "package-name": "tornaco.apps.shortx"
+                }
+            ]
+        },
+        {
+            "info": "General app that won't detect bootloader",
+            "apps": [
+                {
+                    "name": "Scene",
+                    "package-name": "com.omarea.vtools"
+                },
+                {
+                    "name": "Swift Backup",
+                    "package-name": "org.swiftapps.swiftbackup"
+                },
+                {
+                    "name": "Google Docs",
+                    "package-name": "com.google.android.apps.docs.editors.docs"
+                },
+                {
+                    "name": "Google Sheets",
+                    "package-name": "com.google.android.apps.docs.editors.sheets"
+                },
+                {
+                    "name": "Google Slides",
+                    "package-name": "com.google.android.apps.docs.editors.slides"
+                },
+                {
+                    "name": "Google Maps",
+                    "package-name": "com.google.android.apps.maps"
+                },
+                {
+                    "name": "Google Earth",
+                    "package-name": "com.google.earth"
+                },
+                {
+                    "name": "Google Translate",
+                    "package-name": "com.google.android.apps.translate"
+                },
+                {
+                    "name": "Chrome",
+                    "package-name": "com.android.chrome"
+                }
+            ]
+        }
+    ],
+    "Add more app into this list?": [
+        {
+            "issue": "https://github.com/KOWX712/Tricky-Addon-Update-Target-List/issues",
+            "pull-request": "https://github.com/KOWX712/Tricky-Addon-Update-Target-List/pulls"
+        }
+    ]
+}

update.json

@@ -1,6 +1,6 @@
 {
-  "versionCode": 200,
-  "version": "v2.0",
-  "zipUrl": "https://github.com/KOWX712/Tricky-Addon-Update-Target-List/releases/download/v2.0/TrickyAddonModule-v2.0.zip",
-  "changelog": "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/refs/heads/master/changelog.md"
-}
+  "versionCode": 250,
+  "version": "v2.5",
+  "zipUrl": "https://github.com/KOWX712/Tricky-Addon-Update-Target-List/releases/download/v2.5/TrickyAddonModule-v2.5.zip",
+  "changelog": "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/master/changelog.md"
+}