From 59ff2abd77e59c302c0ee36cf07e19e952434feb Mon Sep 17 00:00:00 2001
From: chiteroman <98092901+chiteroman@users.noreply.github.com>
Date: Fri, 1 Dec 2023 11:53:55 +0100
Subject: [PATCH] New beta update!

---
 .idea/gradle.xml              |  2 +-
 app/build.gradle.kts          |  2 +-
 app/src/main/cpp/main.cpp     |  5 ++++-
 module/customize.sh           |  2 +-
 module/module.prop            |  2 +-
 module/pif.json               | 16 ++++++++--------
 module_resetprop/customize.sh |  2 +-
 module_resetprop/module.prop  |  2 +-
 module_resetprop/pif.json     | 16 ++++++++--------
 9 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..cb865f6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a55e175..b62bb00 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -111,7 +111,7 @@ tasks.register<Zip>("zip") {
 }
 
 tasks.register<Zip>("zip-resetprop") {
-    dependsOn("copyFiles")
+    dependsOn("copyFiles-resetprop")
 
     archiveFileName.set("PlayIntegrityFix-resetprop.zip")
     destinationDirectory.set(project.rootDir.resolve("out"))
diff --git a/app/src/main/cpp/main.cpp b/app/src/main/cpp/main.cpp
index 360291e..037b8bc 100644
--- a/app/src/main/cpp/main.cpp
+++ b/app/src/main/cpp/main.cpp
@@ -12,6 +12,8 @@
 
 #define JSON_FILE_PATH "/data/adb/pif.json"
 
+#define DEFAULT_FIRST_API_LEVEL "23"
+
 static std::string FIRST_API_LEVEL, SECURITY_PATCH;
 
 typedef void (*T_Callback)(void *, const char *, const char *, uint32_t);
@@ -26,7 +28,8 @@ static void modify_callback(void *cookie, const char *name, const char *value, u
 
     if (prop.ends_with("api_level")) {
         if (FIRST_API_LEVEL.empty()) {
-            return o_callback(cookie, name, "23", serial);
+            LOGD("[%s]: %s -> %s", name, value, DEFAULT_FIRST_API_LEVEL);
+            return o_callback(cookie, name, DEFAULT_FIRST_API_LEVEL, serial);
         } else {
             LOGD("[%s]: %s -> %s", name, value, FIRST_API_LEVEL.c_str());
             return o_callback(cookie, name, FIRST_API_LEVEL.c_str(), serial);
diff --git a/module/customize.sh b/module/customize.sh
index a7b79b7..9de2fea 100644
--- a/module/customize.sh
+++ b/module/customize.sh
@@ -5,7 +5,7 @@ fi
 
 # Copy default pif.json if it doesn't exist.
 if [ ! -e /data/adb/pif.json ]; then
-	mv -f $MODPATH/pif.json /data/adb/pif.json
+	cp -af $MODPATH/pif.json /data/adb/pif.json
 	ui_print "Moved default pif.json file!"
 fi
 
diff --git a/module/module.prop b/module/module.prop
index 8d594ec..543a78d 100644
--- a/module/module.prop
+++ b/module/module.prop
@@ -1,6 +1,6 @@
 id=playintegrityfix
 name=Play Integrity Fix
-version=v14.0-BETA
+version=v14.0-BETA-2
 versionCode=139
 author=chiteroman
 description=Fix CTS profile (SafetyNet) and DEVICE verdict (Play Integrity).
diff --git a/module/pif.json b/module/pif.json
index ba193b3..57ca789 100644
--- a/module/pif.json
+++ b/module/pif.json
@@ -1,10 +1,10 @@
 {
-  "PRODUCT": "WW_Phone",
-  "DEVICE": "ASUS_Z012D",
-  "MANUFACTURER": "asus",
-  "BRAND": "asus",
-  "MODEL": "ASUS_Z012D",
-  "FINGERPRINT": "asus/WW_Phone/ASUS_Z012D:7.0/NRD90M/14.2015.1701.8-20170222:user/release-keys",
-  "SECURITY_PATCH": "2017-01-01",
-  "FIRST_API_LEVEL": null
+  "PRODUCT": "",
+  "DEVICE": "",
+  "MANUFACTURER": "",
+  "BRAND": "",
+  "MODEL": "",
+  "FINGERPRINT": "",
+  "SECURITY_PATCH": "",
+  "FIRST_API_LEVEL": ""
 }
\ No newline at end of file
diff --git a/module_resetprop/customize.sh b/module_resetprop/customize.sh
index 74ef8cd..d64705f 100644
--- a/module_resetprop/customize.sh
+++ b/module_resetprop/customize.sh
@@ -5,7 +5,7 @@ fi
 
 # Copy default pif.json if it doesn't exist.
 if [ ! -e /data/adb/pif.json ]; then
-	mv -f $MODPATH/pif.json /data/adb/pif.json
+	cp -af $MODPATH/pif.json /data/adb/pif.json
 	ui_print "- Moved default pif.json file!"
 fi
 
diff --git a/module_resetprop/module.prop b/module_resetprop/module.prop
index a7bd995..b2b6142 100644
--- a/module_resetprop/module.prop
+++ b/module_resetprop/module.prop
@@ -1,6 +1,6 @@
 id=playintegrityfix
 name=Play Integrity Fix (resetprop)
-version=v14.0-BETA-resetprop
+version=v14.0-resetprop-BETA-2
 versionCode=139
 author=chiteroman
 description=Fix CTS profile (SafetyNet) and DEVICE verdict (Play Integrity).
diff --git a/module_resetprop/pif.json b/module_resetprop/pif.json
index ba193b3..57ca789 100644
--- a/module_resetprop/pif.json
+++ b/module_resetprop/pif.json
@@ -1,10 +1,10 @@
 {
-  "PRODUCT": "WW_Phone",
-  "DEVICE": "ASUS_Z012D",
-  "MANUFACTURER": "asus",
-  "BRAND": "asus",
-  "MODEL": "ASUS_Z012D",
-  "FINGERPRINT": "asus/WW_Phone/ASUS_Z012D:7.0/NRD90M/14.2015.1701.8-20170222:user/release-keys",
-  "SECURITY_PATCH": "2017-01-01",
-  "FIRST_API_LEVEL": null
+  "PRODUCT": "",
+  "DEVICE": "",
+  "MANUFACTURER": "",
+  "BRAND": "",
+  "MODEL": "",
+  "FINGERPRINT": "",
+  "SECURITY_PATCH": "",
+  "FIRST_API_LEVEL": ""
 }
\ No newline at end of file