v3.3 release

changelog: fix typo

.gitattributes

@@ -3,8 +3,9 @@
 *.prop text eol=lf
 *.md text eol=lf
 *.xml text eol=lf
+*.json text eol=lf
+.extra text eol=lf
 META-INF/** text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
-common/addon/**/tools/** binary
 module/bin/**/** binary

changelog.md

@@ -8,6 +8,11 @@ GitHub release: [Tricky Addon: Update Target List](https://github.com/KOWX712/Tr
 Telegram channel: [KOW's Little World](https://t.me/kowchannel)
 
 ## Changelog
+### v3.3
+- Support auto config `security_patch.txt` for Tricky Store v1.2.1 or higher.
+- No longer need to add `!` to Play Store for devices that have security patch older than one year to get strong integrity in new A13+ check.
+- **Magisk:** automatically add apps from DenyList to `target.txt` on boot. To enable this feature, click "Select from DenyList" once in WebUI after update.
+
 ### v3.2
 - Add `android` and `com.android.vending` by default.
 - Handle `ro.vendor.build.security_patch` if the value is different.
@@ -34,7 +39,7 @@ Telegram channel: [KOW's Little World](https://t.me/kowchannel)
 - Optimized scripts, thanks to @backslashxx.
 - Fixed freeze in weak connection.
 - Added Spanish, thanks to @Keinta15.
-- Removed rescriction on installation but module will still be removed if tricky store is not found after reboot.
+- Removed restriction on installation but module will still be removed if Tricky Store is not found after reboot.
 
 ### v2.8
 - Fixed all KSUWebUIStandalone freeze issue, removed visible option.
@@ -52,7 +57,7 @@ Telegram channel: [KOW's Little World](https://t.me/kowchannel)
 - Press any position of app card to select/deselct.
 
 ### v2.6
-- Invisible module, intergrate action button & webui on tricky store card. You can stil use visible option if you found any issue with invisble module. Thanks for idea from @backslashxx.
+- Invisible module, integrate action button & WebUI on Tricky Store card. You can still use visible option if you found any issue with invisible module. Thanks for idea from @backslashxx.
 - To uninstall invisble module, scroll down to the bottom of WebUI and press Uninstall WebUI.
 - Add update prompt if found new version in webui, and show module if found an update. (invisible)
 - Reduced WebUI loading time

module/action.sh

@@ -14,22 +14,22 @@ abort() {
 }
 
 download() {
-    local type=${1#--}
-    local url=$2
-    local output=$3
+    download_type=${1#--}
+    download_url=$2
+    download_output=$3
 
     PATH=/data/adb/magisk:/data/data/com.termux/files/usr/bin:$PATH
     if command -v curl >/dev/null 2>&1; then
-        if [ "$type" = "output" ]; then
-            timeout 10 curl -Lo "$output" "$url"
+        if [ "$download_type" = "output" ]; then
+            timeout 10 curl -Lo "$download_output" "$download_url"
         else
-            timeout 2 curl -s "$url"
+            timeout 2 curl -s "$download_url"
         fi
     else
-        if [ "$type" = "output" ]; then
-            timeout 10 busybox wget --no-check-certificate -qO "$output" "$url"
+        if [ "$download_type" = "output" ]; then
+            timeout 10 busybox wget --no-check-certificate -qO "$download_output" "$download_url"
         else
-            timeout 2 busybox wget --no-check-certificate -qO- "$url"
+            timeout 2 busybox wget --no-check-certificate -qO- "$download_url"
         fi
     fi
     PATH="$ORG_PATH"

module/common/get_extra.sh

@@ -5,28 +5,35 @@ SKIPLIST="$MODPATH/tmp/skiplist"
 OUTPUT="$MODPATH/tmp/exclude-list"
 KBOUTPUT="$MODPATH/tmp/.extra"
 
+if [ "$MODPATH" = "/data/adb/modules/.TA_utl/common" ]; then
+    MODDIR="/data/adb/modules/.TA_utl"
+    MAGISK="true"
+else
+    MODDIR="/data/adb/modules/TA_utl"
+fi
+
 aapt() { "$MODPATH/aapt" "$@"; }
 
 # probe for downloaders
 # wget = low pref, no ssl.
 # curl, has ssl on android, we use it if found
 download() {
-    local type=${1#--}
-    local url=$2
-    local output=$3
+    download_type=${1#--}
+    download_url=$2
+    download_output=$3
 
     PATH=/data/adb/ap/bin:/data/adb/ksu/bin:/data/adb/magisk:/data/data/com.termux/files/usr/bin:$PATH
     if command -v curl >/dev/null 2>&1; then
-        if [ "$type" = "output" ]; then
-            timeout 10 curl -Lo "$output" "$url"
+        if [ "$download_type" = "output" ]; then
+            timeout 10 curl -Lo "$download_output" "$download_url"
         else
-            timeout 3 curl -s "$url"
+            timeout 3 curl -s "$download_url"
         fi
     else
-        if [ "$type" = "output" ]; then
-            timeout 10 busybox wget --no-check-certificate -qO "$output" "$url"
+        if [ "$download_type" = "output" ]; then
+            timeout 10 busybox wget --no-check-certificate -qO "$download_output" "$download_url"
         else
-            timeout 3 busybox wget --no-check-certificate -qO- "$url"
+            timeout 3 busybox wget --no-check-certificate -qO- "$download_url"
         fi
     fi
     PATH="$ORG_PATH"
@@ -57,11 +64,12 @@ get_unnecessary() {
 }
 
 check_update() {
+    [ -f "$MODDIR/disable" ] && rm -f "$MODDIR/disable"
     JSON=$(download --fetch "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/main/update.json") || exit 1
     REMOTE_VERSION=$(echo "$JSON" | grep -o '"versionCode": *[0-9]*' | awk -F: '{print $2}' | tr -d ' ')
     LOCAL_VERSION=$(grep -o 'versionCode=[0-9]*' "$MODPATH/update/module.prop" | awk -F= '{print $2}')
     if [ "$REMOTE_VERSION" -gt "$LOCAL_VERSION" ] && [ ! -f "/data/adb/modules/TA_utl/update" ]; then
-        if [ "$MODPATH" = "/data/adb/modules/.TA_utl/common" ]; then
+        if [ "$MAGISK" = "true" ]; then
             [ -d "/data/adb/modules/TA_utl" ] && rm -rf "/data/adb/modules/TA_utl"
             cp -rf "$MODPATH/update" "/data/adb/modules/TA_utl"
         else
@@ -72,8 +80,7 @@ check_update() {
 }
 
 uninstall() {
-    if [ "$MODPATH" = "/data/adb/modules/.TA_utl/common" ]; then
-        [ -d "/data/adb/modules/TA_utl" ] && rm -rf "/data/adb/modules/TA_utl"
+    if [ "$MAGISK" = "true" ]; then
         cp -rf "$MODPATH/update" "/data/adb/modules/TA_utl"
     else
         cp -f "$MODPATH/update/module.prop" "/data/adb/modules/TA_utl/module.prop"
@@ -90,15 +97,14 @@ get_update() {
 }
 
 install_update() {
-    if command -v magisk >/dev/null 2>&1; then
+    command -v magisk >/dev/null 2>&1 && {
         magisk --install-module "$MODPATH/tmp/module.zip"
-    elif command -v apd >/dev/null 2>&1; then
+    } || command -v apd >/dev/null 2>&1 && {
         apd module install "$MODPATH/tmp/module.zip"
-    elif command -v ksud >/dev/null 2>&1; then
+    } || command -v ksud >/dev/null 2>&1 && {
         ksud module install "$MODPATH/tmp/module.zip"
-    else
-        exit 1
-    fi
+    } || exit 1
+
     rm -f "$MODPATH/tmp/module.zip"
     rm -f "$MODPATH/tmp/changelog.md"
 }

module/module.prop

@@ -1,7 +1,7 @@
 id=TA_utl
 name=Tricky Addon - Update Target List
-version=v3.2
-versionCode=320
+version=v3.3
+versionCode=330
 author=KOWX712
 description=A WebUI to conifgure tricky store target.txt 
 updateJson=https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/main/update.json

module/service.sh

@@ -1,7 +1,7 @@
 MODPATH=${0%/*}
 HIDE_DIR="/data/adb/modules/.TA_utl"
 TS="/data/adb/modules/tricky_store"
-SCRIPT_DIR="/data/adb/tricky_store"
+TARGET_DIR="/data/adb/tricky_store"
 TSPA="/data/adb/modules/tsupport-advance"
 
 aapt() { "$MODPATH/common/aapt" "$@"; }
@@ -33,7 +33,12 @@ fi
 security_patch=$(getprop ro.build.version.security_patch)
 vendor_patch=$(getprop ro.vendor.build.security_patch)
 if [ "$vendor_patch" != "$security_patch" ]; then
-    resetprop ro.vendor.build.security_patch "$security_patch"
+    TS_version=$(grep "versionCode=" "$TS/module.prop" | cut -d'=' -f2)
+    if [ "$TS_version" -lt 158 ]; then
+        resetprop -n ro.vendor.build.security_patch "$security_patch"
+    else
+        printf "boot=%s\nvendor=%s\n" "$security_patch" "$security_patch" > "$TARGET_DIR/security_patch.txt"
+    fi
 fi
 
 # Disable TSupport-A auto update target to prevent overwrite
@@ -73,32 +78,41 @@ fi
 # Optimization
 OUTPUT_APP="$MODPATH/common/tmp/applist"
 OUTPUT_SKIP="$MODPATH/common/tmp/skiplist"
-OUTPUT_TMP="$MODPATH/common/tmp/tmp_applist"
 
 until [ "$(getprop sys.boot_completed)" = "1" ]; do
     sleep 1
 done
 
+# Create temporary directory
 mkdir -p "$MODPATH/common/tmp"
-pm list packages -3 2>/dev/null | awk -F: '{print $2}' > "$OUTPUT_TMP"
 
+# Additional system apps
 SYSTEM_APP="com.google.android.gms|com.google.android.gsf|com.android.vending"
-pm list package -s | awk -F: '{print $2}' | grep -Ex "$SYSTEM_APP" >> "$OUTPUT_TMP"
 
+# Initialize cache files to save app list and skip list
 echo "# This file is generated from service.sh to speed up load time" > "$OUTPUT_APP"
 echo "# This file is generated from service.sh to speed up load time" > "$OUTPUT_SKIP"
-cat "$OUTPUT_TMP" | while read -r PACKAGE; do
+
+# Get list of third party apps and specific system apps, then cache app name
+# Check Xposed module
+{ 
+    pm list packages -3 2>/dev/null
+    pm list package -s | grep -E "$SYSTEM_APP"
+} | awk -F: '{print $2}' | while read -r PACKAGE; do
+    # Get APK path for the package
     APK_PATH=$(pm path "$PACKAGE" 2>/dev/null | grep "base.apk" | awk -F: '{print $2}' | tr -d '\r')
     [ -z "$APK_PATH" ] && APK_PATH=$(pm path "$PACKAGE" 2>/dev/null | grep ".apk" | awk -F: '{print $2}' | tr -d '\r')
+
     if [ -n "$APK_PATH" ]; then
+        # Extract app name and save package info
         APP_NAME=$(aapt dump badging "$APK_PATH" 2>/dev/null | grep "application-label:" | sed "s/application-label://g; s/'//g")
         echo "app-name: $APP_NAME, package-name: $PACKAGE" >> "$OUTPUT_APP"
     else
         echo "app-name: Unknown App package-name: $PACKAGE" >> "$OUTPUT_APP"
     fi
+
+    # Check if app is Xposed module and add to skip list if not
     if ! aapt dump xmltree "$APK_PATH" AndroidManifest.xml 2>/dev/null | grep -qE "xposed.category|xposeddescription"; then
         echo "$PACKAGE" >> "$OUTPUT_SKIP"
     fi
 done
-
-rm -f "$OUTPUT_TMP"

update.json

@@ -1,6 +1,6 @@
 {
-  "versionCode": 320,
-  "version": "v3.2",
-  "zipUrl": "https://github.com/KOWX712/Tricky-Addon-Update-Target-List/releases/download/v3.2/TrickyAddonModule-v3.2.zip",
+  "versionCode": 330,
+  "version": "v3.3",
+  "zipUrl": "https://github.com/KOWX712/Tricky-Addon-Update-Target-List/releases/download/v3.3/TrickyAddonModule-v3.3.zip",
   "changelog": "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/main/changelog.md"
 }