From 451769c3419f64d81cce140929425bf036890aef Mon Sep 17 00:00:00 2001
From: osm0sis <osm0sis@outlook.com>
Date: Sat, 7 Jun 2025 13:49:25 -0300
Subject: [PATCH] Clean up any modified custom ROM persist props on uninstall

---
 module/common_func.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/module/common_func.sh b/module/common_func.sh
index 3833213..6cc7ddf 100644
--- a/module/common_func.sh
+++ b/module/common_func.sh
@@ -8,12 +8,20 @@ delprop_if_exist() {
     [ -n "$(resetprop "$NAME")" ] && resetprop --delete "$NAME"
 }
 
-# persistprop <prop name> <value>
+# persistprop <prop name> <new value>
 persistprop() {
     local NAME="$1"
-    local VALUE="$2"
+    local NEWVALUE="$2"
+    local CURVALUE="$(resetprop "$NAME")"
 
-    resetprop -n -p "$NAME" "$VALUE"
+    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 --delete \"$NAME\"" >> $MODPATH/uninstall.sh
+        fi
+    fi
+    resetprop -n -p "$NAME" "$NEWVALUE"
 }
 
 RESETPROP="resetprop -n"