feat: support resetprop compact

Author: KOWX712

module/common_func.sh

@@ -1,62 +1,10 @@
-RESETPROP="resetprop -n"
-[ -f /data/adb/magisk/util_functions.sh ] && [ "$(grep MAGISK_VER_CODE /data/adb/magisk/util_functions.sh | cut -d= -f2)" -lt 27003 ] && RESETPROP=resetprop_hexpatch
-
-# persistprop <prop name> <new value>
-persistprop() {
-    local NAME="$1"
-    local NEWVALUE="$2"
-    local CURVALUE="$(resetprop "$NAME")"
-
-    if ! grep -q "$NAME" $MODPATH/uninstall.sh 2>/dev/null; then
-        if [ "$CURVALUE" ]; then
-            [ "$NEWVALUE" = "$CURVALUE" ] || echo "resetprop -n -p \"$NAME\" \"$CURVALUE\"" >> $MODPATH/uninstall.sh
-        else
-            echo "resetprop -p --delete \"$NAME\"" >> $MODPATH/uninstall.sh
-        fi
-    fi
-    resetprop -n -p "$NAME" "$NEWVALUE"
-}
-
-# resetprop_hexpatch [-f|--force] <prop name> <new value>
-resetprop_hexpatch() {
-    case "$1" in
-        -f|--force) local FORCE=1; shift;;
-    esac 
-
-    local NAME="$1"
-    local NEWVALUE="$2"
-    local CURVALUE="$(resetprop "$NAME")"
-
-    [ ! "$NEWVALUE" -o ! "$CURVALUE" ] && return 1
-    [ "$NEWVALUE" = "$CURVALUE" -a ! "$FORCE" ] && return 2
-
-    local NEWLEN=${#NEWVALUE}
-    if [ -f /dev/__properties__ ]; then
-        local PROPFILE=/dev/__properties__
-    else
-        local PROPFILE="/dev/__properties__/$(resetprop -Z "$NAME")"
-    fi
-    [ ! -f "$PROPFILE" ] && return 3
-    local NAMEOFFSET=$(echo $(strings -t d "$PROPFILE" | grep "$NAME") | cut -d ' ' -f 1)
-
-    #<hex 2-byte change counter><flags byte><hex length of prop value><prop value + nul padding to 92 bytes><prop name>
-    local NEWHEX="$(printf '%02x' "$NEWLEN")$(printf "$NEWVALUE" | od -A n -t x1 -v | tr -d ' \n')$(printf "%$((92-NEWLEN))s" | sed 's/ /00/g')"
-
-    printf "Patch '$NAME' to '$NEWVALUE' in '$PROPFILE' @ 0x%08x -> \n[0000??$NEWHEX]\n" $((NAMEOFFSET-96))
-
-    echo -ne "\x00\x00" \
-        | dd obs=1 count=2 seek=$((NAMEOFFSET-96)) conv=notrunc of="$PROPFILE"
-    echo -ne "$(printf "$NEWHEX" | sed -e 's/.\{2\}/&\\x/g' -e 's/^/\\x/' -e 's/\\x$//')" \
-        | dd obs=1 count=93 seek=$((NAMEOFFSET-93)) conv=notrunc of="$PROPFILE"
-}
-
 # resetprop_if_diff <prop name> <expected value>
 resetprop_if_diff() {
     local NAME="$1"
     local EXPECTED="$2"
     local CURRENT="$(resetprop "$NAME")"
 
-    [ -z "$CURRENT" ] || [ "$CURRENT" = "$EXPECTED" ] || $RESETPROP "$NAME" "$EXPECTED"
+    [ -z "$CURRENT" ] || [ "$CURRENT" = "$EXPECTED" ] || resetprop -n "$NAME" "$EXPECTED"
 }
 
 # resetprop_if_match <prop name> <value match string> <new value>
@@ -65,7 +13,7 @@ resetprop_if_match() {
     local CONTAINS="$2"
     local VALUE="$3"
 
-    [[ "$(resetprop "$NAME")" = *"$CONTAINS"* ]] && $RESETPROP "$NAME" "$VALUE"
+    [[ "$(resetprop "$NAME")" = *"$CONTAINS"* ]] && resetprop -n "$NAME" "$VALUE"
 }
 
 # stub for boot-time

module/customize.sh

@@ -77,9 +77,6 @@ if [ -f "/data/adb/modules/playintegrityfix/system.prop" ]; then
     cp -af /data/adb/modules/playintegrityfix/system.prop "$MODPATH/system.prop"
 fi
 
-# Restore previous settings
-[ -f "/data/adb/modules/playintegrityfix/uninstall.sh" ] && cp -af /data/adb/modules/playintegrityfix/uninstall.sh "$MODPATH/uninstall.sh"
-
 # Check custom fingerprint
 if [ -f "/data/adb/pif.prop" ]; then
     ui_print "- Backup custom pif.prop"

module/post-fs-data.sh

@@ -51,19 +51,19 @@ resetprop_if_diff ro.secure 1
 # Work around custom ROM PropImitationHooks conflict when their persist props don't exist
 if [ -n "$(resetprop ro.aospa.version)" -o -n "$(resetprop net.pixelos.version)" -o -n "$(resetprop ro.afterlife.version)" -o -f /data/system/gms_certified_props.json ]; then
     for PROP in persist.sys.pihooks.first_api_level persist.sys.pihooks.security_patch; do
-        resetprop | grep -q "\[$PROP\]" || persistprop "$PROP" ""
+        resetprop | grep -q "\[$PROP\]" || resetprop -n -p "$PROP" ""
     done
 fi
 
 # Work around supported custom ROM PropImitationHooks/PixelPropsUtils (and hybrids) conflict when spoofProvider is disabled
 if resetprop | grep -qE "persist.sys.pihooks|persist.sys.entryhooks|persist.sys.pixelprops" || [ -f /data/system/gms_certified_props.json ]; then
-    persistprop persist.sys.pihooks.disable.gms_props true
-    persistprop persist.sys.pihooks.disable.gms_key_attestation_block true
-    persistprop persist.sys.entryhooks_enabled false
-    persistprop persist.sys.pixelprops.gms false
-    persistprop persist.sys.pixelprops.gapps false
-    persistprop persist.sys.pixelprops.google false
-    persistprop persist.sys.pixelprops.pi false
+    resetprop -n -p persist.sys.pihooks.disable.gms_props true
+    resetprop -n -p persist.sys.pihooks.disable.gms_key_attestation_block true
+    resetprop -n -p persist.sys.entryhooks_enabled false
+    resetprop -n -p persist.sys.pixelprops.gms false
+    resetprop -n -p persist.sys.pixelprops.gapps false
+    resetprop -n -p persist.sys.pixelprops.google false
+    resetprop -n -p persist.sys.pixelprops.pi false
 fi
 
 # LeafOS "gmscompat: Dynamically spoof props for GMS"
@@ -72,3 +72,5 @@ fi
 if [ -f /data/system/gms_certified_props.json ] && [ ! "$(resetprop persist.sys.spoof.gms)" = "false" ]; then
 	resetprop persist.sys.spoof.gms false
 fi
+
+resetprop -c || true

module/uninstall.sh

@@ -7,4 +7,4 @@ if [ -f /data/system/gms_certified_props.json ]; then
 	resetprop -p --delete persist.sys.spoof.gms
 fi
 
-# Persist props
+resetprop -c || true