From 5464ec90feabc00e6d0bc594c7a4e9e2428f1fc7 Mon Sep 17 00:00:00 2001
From: osm0sis <osm0sis@outlook.com>
Date: Fri, 1 Dec 2023 21:09:52 -0400
Subject: [PATCH] Prep module files

---
 changelog.md                                   | 18 ++++++------------
 .../META-INF/com/google/android/updater-script |  2 +-
 module/customize.sh                            |  6 +++---
 module/module.prop                             | 12 ++++++------
 update.json                                    |  8 ++++----
 5 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/changelog.md b/changelog.md
index 8bf2c56..396581d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,13 +1,7 @@
-We have a Telegram channel!
-If you want to share your knowledge join:
-https://t.me/playintegrityfix
+# CUSTOM SPOOF FORK v3
 
-# CUSTOM SPOOF v2.1
-
-DO NOT USE THIS BUILD IF YOU AREN'T A DEVELOPER, ALWAYS USE LATEST STABLE.
-THIS BUILD IS JUST FOR TESTING PURPOSES.
-
-- Removed custom resetprop.
-- Fix JSON parsing.
-- Less libs size.
-- Few code improvements.
+- Combine system.prop (runs at post-fs-data) entries into service.sh so that they're only set if needed
+- Clean up GMS data pif.prop/pif.json files left over from previous releases to ensure they don't trigger detection
+- Use custom.pif.json for custom spoofing if it exists, self-contained in the module directory, and restore it after module updates
+- Move props that need to be changed earlier into post-fs-data.sh
+- Warn of possible conflict if MagiskHidePropsConfig (MHPC) is installed
diff --git a/module/META-INF/com/google/android/updater-script b/module/META-INF/com/google/android/updater-script
index 492be83..f225797 100644
--- a/module/META-INF/com/google/android/updater-script
+++ b/module/META-INF/com/google/android/updater-script
@@ -1 +1 @@
-#MAGISK
\ No newline at end of file
+#MAGISK
diff --git a/module/customize.sh b/module/customize.sh
index 0b02fdf..4b98bc3 100644
--- a/module/customize.sh
+++ b/module/customize.sh
@@ -1,15 +1,15 @@
 # Error on < Android 8
 if [ "$API" -lt 26 ]; then
-    abort "!!! You can't use this module on Android < 8.0"
+    abort "! You can't use this module on Android < 8.0"
 fi
 
 # Remove/warn if conflicting modules are installed
 if [ -d /data/adb/modules/safetynet-fix ]; then
     touch /data/adb/modules/safetynet-fix/remove
-    ui_print "- 'safetynet-fix' module will be removed on next reboot"
+    ui_print "! Universal SafetyNet Fix (USNF) module will be removed on next reboot"
 fi
 if [ -d /data/adb/modules/MagiskHidePropsConf ]; then
-    ui_print "- Warning, 'MagiskHidePropsConf' module may cause issues with PIF"
+    ui_print "! MagiskHidePropsConfig (MHPC) module may cause issues with PIF"
 fi
 
 # Copy any custom.pif.json to updated module
diff --git a/module/module.prop b/module/module.prop
index 0503971..e43b1fe 100644
--- a/module/module.prop
+++ b/module/module.prop
@@ -1,7 +1,7 @@
 id=playintegrityfix
-name=Play Integrity Fix
-version=PROPS-v2.1
-versionCode=2101
-author=chiteroman
-description=Fix CTS profile (SafetyNet) and DEVICE verdict (Play Integrity).
-updateJson=https://raw.githubusercontent.com/chiteroman/PlayIntegrityFix/custom/update.json
+name=Play Integrity Fork
+version=v3
+versionCode=3000
+author=osm0sis & chiteroman @ xda-developers
+description=Fix CTS profile (SafetyNet) and DEVICE verdict (Play Integrity)
+updateJson=https://raw.githubusercontent.com/osm0sis/PlayIntegrityFork/main/update.json
diff --git a/update.json b/update.json
index f39cd59..2736ec1 100644
--- a/update.json
+++ b/update.json
@@ -1,6 +1,6 @@
 {
-    "version": "v2.1",
-    "versionCode": 2101,
-    "zipUrl": "https://github.com/chiteroman/PlayIntegrityFix/releases/download/PROPS/PlayIntegrityFix_PROPS-v2.1.zip",
-    "changelog": "https://raw.githubusercontent.com/chiteroman/PlayIntegrityFix/custom/changelog.md"
+    "version": "v3",
+    "versionCode": 3000,
+    "zipUrl": "https://github.com/osm0sis/PlayIntegrityFork/releases/download/v3/PlayIntegrityFork-v3.zip",
+    "changelog": "https://raw.githubusercontent.com/osm0sis/PlayIntegrityFork/main/changelog.md"
 }