diff --git a/app/build.gradle b/app/build.gradle index 1bb45332..fab5d138 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' def gitCommitCount = Integer.parseInt('git rev-list --count HEAD'.execute([], project.rootDir).text.trim()) -def baseVersionName = '19.1' +def baseVersionName = '19.4' android { compileSdkVersion rootProject.ext.targetSdkVersion diff --git a/app/src/main/java/moe/riru/manager/utils/NativeHelper.java b/app/src/main/java/moe/riru/manager/utils/NativeHelper.java index 03f49672..ec4c7a01 100644 --- a/app/src/main/java/moe/riru/manager/utils/NativeHelper.java +++ b/app/src/main/java/moe/riru/manager/utils/NativeHelper.java @@ -9,13 +9,14 @@ @Keep public class NativeHelper { + private static final int V19_4 = 26; private static final int V19_3 = 25; private static final int V19_2 = 24; private static final int V19_1 = 22; private static final int V19 = 20; private static final int V18 = 19; private static final int V17_1 = 18; - private static final int MAX_VERSION = V19_3; + private static final int MAX_VERSION = V19_4; static { System.loadLibrary("helper"); @@ -31,6 +32,8 @@ public static String versionName(Context context, int versionCode) { } switch (versionCode) { + case V19_4: + return "v19.4"; case V19_3: return "v19.3"; case V19_2: diff --git a/riru-core/build.gradle b/riru-core/build.gradle index d9128eb8..e7aa10a9 100644 --- a/riru-core/build.gradle +++ b/riru-core/build.gradle @@ -24,8 +24,8 @@ def moduleId = "riru-core" def moduleName = "Riru - Core" def moduleAuthor = "Rikka" def moduleDescription = "Inject zygote process by replace libmemtrack.so, provide interface to other Riru modules." -def versionName = "v19.3" -def versionCode = 25 +def versionName = "v19.4" +def versionCode = 26 def zipNameMagisk = "magisk-${project.name}-${versionName}.zip" diff --git a/riru-core/jni/main/jni_native_method.cpp b/riru-core/jni/main/jni_native_method.cpp index b21e9dd5..aade4423 100644 --- a/riru-core/jni/main/jni_native_method.cpp +++ b/riru-core/jni/main/jni_native_method.cpp @@ -99,7 +99,7 @@ static void nativeForkAndSpecialize_pre( static void nativeForkAndSpecialize_post(JNIEnv *env, jclass clazz, jint uid, jint res) { - unhook_jniRegisterNativeMethods(); + if (res == 0) unhook_jniRegisterNativeMethods(); for (auto module : *get_modules()) { if (!module->forkAndSpecializePost) diff --git a/riru-core/jni/main/main.cpp b/riru-core/jni/main/main.cpp index 9896e028..f326e286 100644 --- a/riru-core/jni/main/main.cpp +++ b/riru-core/jni/main/main.cpp @@ -288,7 +288,7 @@ void unhook_jniRegisterNativeMethods() { nullptr); if (xhook_refresh(0) == 0) { xhook_clear(); - LOGI("hook removed"); + LOGV("hook removed"); } } diff --git a/riru-core/jni/main/version.h b/riru-core/jni/main/version.h index b7d991b8..30aaf8da 100644 --- a/riru-core/jni/main/version.h +++ b/riru-core/jni/main/version.h @@ -1,7 +1,7 @@ #ifndef VERSION_H #define VERSION_H -#define VERSION_CODE 25 -#define VERSION_NAME "v19.3" +#define VERSION_CODE 26 +#define VERSION_NAME "v19.4" #endif // VERSION_H