Fix errors

Author: chiteroman

build.gradle.kts

@@ -1,5 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
+    alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
 }
 
@@ -11,8 +12,8 @@ tasks.register("copyZygiskFiles") {
         val zygiskBuildDir = zygiskModule.layout.buildDirectory.get().asFile
 
         val classesJar = zygiskBuildDir
-            .resolve("intermediates/aar_main_jar/release/syncReleaseLibJars/classes.jar")
-        classesJar.copyTo(moduleFolder.resolve("classes.jar"), overwrite = true)
+            .resolve("intermediates/dex/release/minifyReleaseWithR8/classes.dex")
+        classesJar.copyTo(moduleFolder.resolve("classes.dex"), overwrite = true)
 
         val zygiskSoDir = zygiskBuildDir
             .resolve("intermediates/stripped_native_libs/release/stripReleaseDebugSymbols/out/lib")

changelog.md

@@ -9,3 +9,4 @@ hiddenapibypass = { group = "org.lsposed.hiddenapibypass", name = "hiddenapibypa
 
 [plugins]
 android-library = { id = "com.android.library", version.ref = "agp" }
+android-application = { id = "com.android.application", version.ref = "agp" }

gradle/libs.versions.toml

@@ -15,7 +15,7 @@ static nlohmann::json json;
 static bool spoofProps = true, spoofProvider = true, spoofSignature = false;
 
 static bool DEBUG = false;
-static std::string DEVICE_INITIAL_SDK_INT, SECURITY_PATCH, BUILD_ID;
+static std::string DEVICE_INITIAL_SDK_INT = "21", SECURITY_PATCH, BUILD_ID;
 
 typedef void (*T_Callback)(void *, const char *, const char *, uint32_t);
 
@@ -215,11 +215,10 @@ static void injectDex() {
     auto dexClClass = env->FindClass("dalvik/system/PathClassLoader");
     auto dexClInit = env->GetMethodID(
             dexClClass, "<init>",
-            "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)V");
-    auto str1 = env->NewStringUTF((dir + "/classes.dex").c_str());
-    auto str2 = env->NewStringUTF(dir.c_str());
+            "(Ljava/lang/String;Ljava/lang/ClassLoader;)V");
+    auto classesJar = env->NewStringUTF((dir + "/classes.dex").c_str());
     auto dexCl =
-            env->NewObject(dexClClass, dexClInit, str1, str2, systemClassLoader);
+            env->NewObject(dexClClass, dexClInit, classesJar, systemClassLoader);
 
     if (env->ExceptionCheck()) {
         env->ExceptionDescribe();
@@ -257,17 +256,15 @@ static void injectDex() {
     env->DeleteLocalRef(entryClassObj);
     env->DeleteLocalRef(jsonStr);
     env->DeleteLocalRef(dexCl);
-    env->DeleteLocalRef(str1);
-    env->DeleteLocalRef(str2);
+    env->DeleteLocalRef(classesJar);
     env->DeleteLocalRef(dexClClass);
     env->DeleteLocalRef(clClass);
 
     LOGD("jni memory free");
 }
 
 extern "C" [[gnu::visibility("default"), maybe_unused]] bool
-init(JavaVM *vm, const std::string &gmsDir) {
-    bool close = true;
+init(JavaVM *vm, const std::string &gmsDir, bool trickyStore, bool testSignedRom) {
 
     if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK) {
         LOGE("[INJECT] JNI_ERR!");
@@ -283,20 +280,28 @@ init(JavaVM *vm, const std::string &gmsDir) {
 
     parseJSON();
 
+    if (trickyStore) {
+        spoofProvider = false;
+        spoofSignature = false;
+        spoofProps = false;
+    }
+
+    if (testSignedRom) {
+        spoofProvider = true;
+        spoofSignature = true;
+    }
+
     UpdateBuildFields();
 
     if (spoofProvider || spoofSignature) {
         injectDex();
     } else {
-        LOGD("[INJECT] Dex file won't be injected due spoofProvider and "
-             "spoofSignature are false");
+        LOGD("[INJECT] Dex file won't be injected due spoofProvider and spoofSignature are false");
     }
 
     if (spoofProps) {
-        close = !doHook();
+        return !doHook();
     }
 
-    LOGD("[INJECT] Done!");
-
-    return close;
+    return true;
 }

inject/src/main/cpp/inject.cpp

@@ -1,7 +1,6 @@
 id=playintegrityfix
-name=Play Integrity Fix
-version=v18.9
-versionCode=18900
+name=Play Integrity Fix [INJECT]
+version=v3-inject
+versionCode=3
 author=chiteroman
 description=Universal modular fix for Play Integrity (and SafetyNet) on devices running Android 8-15
-updateJson=https://raw.githubusercontent.com/chiteroman/PlayIntegrityFix/main/update.json

module/classes.jar

@@ -1,5 +1,5 @@
 plugins {
-    alias(libs.plugins.android.library)
+    alias(libs.plugins.android.application)
 }
 
 android {
@@ -53,9 +53,7 @@ android {
         release {
             isMinifyEnabled = true
             multiDexEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
-            )
+            proguardFiles += file("proguard-rules.pro")
         }
     }
 

module/module.prop

@@ -9,7 +9,3 @@ find_package(cxx REQUIRED CONFIG)
 link_libraries(cxx::cxx)
 
 add_library(zygisk SHARED zygisk.cpp)
-
-add_subdirectory(xdl)
-
-target_link_libraries(zygisk PRIVATE xdl)