v15.9.4

app/build.gradle.kts

@@ -12,14 +12,10 @@ android {
         applicationId = "es.chiteroman.playintegrityfix"
         minSdk = 26
         targetSdk = 34
-        versionCode = 15930
+        versionCode = 15940
-        versionName = "v15.9.3"
+        versionName = "v15.9.4"
         multiDexEnabled = false
 
-        buildFeatures {
-            prefab = true
-        }
-
         packaging {
             jniLibs {
                 excludes += "**/liblog.so"
@@ -29,18 +25,16 @@ android {
 
         externalNativeBuild {
             cmake {
-                arguments += "-DANDROID_STL=none"
+                arguments += "-DANDROID_STL=c++_static"
-                arguments += "-DCMAKE_BUILD_TYPE=MinSizeRel"
+                arguments += "-DCMAKE_BUILD_TYPE=Release"
+                arguments += "-DPlugin.Android.BionicLinkerUtil=ON"
 
-                cFlags += "-std=c2x"
+                cppFlags += "-std=c++20"
-                cFlags += "-fvisibility=hidden"
-                cFlags += "-fvisibility-inlines-hidden"
-
-                cppFlags += "-std=c++2b"
                 cppFlags += "-fno-exceptions"
                 cppFlags += "-fno-rtti"
                 cppFlags += "-fvisibility=hidden"
                 cppFlags += "-fvisibility-inlines-hidden"
+                cppFlags += "-flto"
             }
         }
     }
@@ -67,10 +61,6 @@ android {
     }
 }
 
-dependencies {
-    implementation("dev.rikka.ndk.thirdparty:cxx:1.2.0")
-}
-
 tasks.register("updateModuleProp") {
     doLast {
         val versionName = project.android.defaultConfig.versionName

app/src/main/cpp/CMakeLists.txt

@@ -4,10 +4,6 @@ project(playintegrityfix)
 
 add_library(${CMAKE_PROJECT_NAME} SHARED main.cpp)
 
-find_package(cxx REQUIRED CONFIG)
-
-link_libraries(cxx::cxx)
-
 add_subdirectory(Dobby)
 
-target_link_libraries(${CMAKE_PROJECT_NAME} log dobby_static)
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE log dobby_static)

app/src/main/cpp/Dobby/CMakeLists.txt

@@ -26,7 +26,7 @@ option(Plugin.SymbolResolver "Enable symbol resolver" ON)
 
 option(Plugin.ImportTableReplace "Enable import table replace " OFF)
 
-option(Plugin.Android.BionicLinkerUtil "Enable android bionic linker util" OFF)
+option(Plugin.Android.BionicLinkerUtil "Enable android bionic linker util" ON)
 
 option(DOBBY_BUILD_EXAMPLE "Build example" OFF)
 

app/src/main/java/es/chiteroman/playintegrityfix/CustomKeyStoreSpi.java

@@ -27,16 +27,7 @@ public final class CustomKeyStoreSpi extends KeyStoreSpi {
 
     @Override
     public Certificate[] engineGetCertificateChain(String alias) {
-        Certificate[] certificates;
+        Certificate[] certificates = keyStoreSpi.engineGetCertificateChain(alias);
-
-        // Check for broken TEE devices... It shouldn't happen because exception is in generateKeyPair
-        // Also, for custom roms which implement a bypass :D
-        try {
-            certificates = keyStoreSpi.engineGetCertificateChain(alias);
-        } catch (Throwable t) {
-            EntryPoint.LOG("engineGetCertificateChain: " + t);
-            throw new UnsupportedOperationException();
-        }
 
         // If certificate array is null, throw exception
         // This shouldn't happen...

changelog.md

@@ -5,6 +5,6 @@ https://t.me/playintegrityfix
 Device verdict should pass by default.
 If not, try removing /data/adb/pif.json file.
 
-# v15.9.3
+# v15.9.4
 
-- Fix bootloop issue on few devices x2
+- Misc improvements.

module/customize.sh

@@ -22,8 +22,10 @@ if [ -f "/data/adb/pif.json" ]; then
     ui_print "- If pif.json file doesn't exist, module will use default one"
 fi
 
+ui_print "- Removing conflict apps..."
+
 # Remove conflict apps
-REMOVE="
+APPS="
 /system/app/EliteDevelopmentModule
 /system/app/XInjectModule
 /system/product/app/XiaomiEUInject
@@ -32,18 +34,17 @@ REMOVE="
 /system/system_ext/app/PifPrebuilt
 "
 
-if [ "$KSU" = "true" ] || [ "$APATCH" = "true" ] || [ "$MAGISK_VER" = *"-kitsune" ]; then
+for app in $APPS; do
-    ui_print "- KernelSU / APatch / Kitsune Magisk detected, all apps removed!"
+        if [ -d "$app" ]; then
-else
+            directory="$MODPATH$app"
-    ui_print "- Other Magisk detected, conflict apps will be removed one by one"
-    for path in $REMOVE; do
-        if [ -d "$path" ]; then
-            directory="$MODPATH${path}"
             [ -d "$directory" ] || mkdir -p "$directory"
-            touch "$directory/.replace"
+            if [ "$KSU" = "true" ] || [ "$APATCH" = "true" ]; then
-            ui_print "- ${path##*/} app removed"
+                mknod $directory c 0 0
             else
-            ui_print "- ${path##*/} app doesn't exist, skip"
+                touch $directory/.replace
+            fi
+            ui_print "- ${app##*/} app removed"
+        else
+            ui_print "- ${app##*/} app doesn't exist, skip"
         fi
 done
-fi

module/module.prop

@@ -1,7 +1,7 @@
 id=playintegrityfix
 name=Play Integrity Fix
-version=v15.9.3
+version=v15.9.4
-versionCode=15930
+versionCode=15940
 author=chiteroman
 description=Universal modular fix for Play Integrity (and SafetyNet) on devices running Android 8-14.
 updateJson=https://raw.githubusercontent.com/chiteroman/PlayIntegrityFix/main/update.json

module/service.sh

@@ -51,4 +51,10 @@ fi
     resetprop_if_diff vendor.boot.verifiedbootstate green
 
     resetprop_if_diff vendor.boot.vbmeta.device_state locked
+
+    resetprop_if_diff ro.crypto.state encrypted
+
+    resetprop_if_diff ro.secureboot.lockstate locked
+
+    resetprop_if_diff ro.boot.realmebootstate green
 }&

update.json

@@ -1,6 +1,6 @@
 {
-  "version": "v15.9.3",
+  "version": "v15.9.4",
-  "versionCode": 15930,
+  "versionCode": 15940,
-  "zipUrl": "https://github.com/chiteroman/PlayIntegrityFix/releases/download/v15.9.3/PlayIntegrityFix_v15.9.3.zip",
+  "zipUrl": "https://github.com/chiteroman/PlayIntegrityFix/releases/download/v15.9.4/PlayIntegrityFix_v15.9.4.zip",
   "changelog": "https://raw.githubusercontent.com/chiteroman/PlayIntegrityFix/main/changelog.md"
 }