Skip to content

Commit b563131

Browse files
committed
Update LSPlant for Android 15
Convert ScopedLocalRef to its reference, otherwise we get error: no viable conversion from 'ScopedLocalRef<_jobject *>' (aka 'lsplant::ScopedLocalRef<_jobject *>') to 'jobject' (aka '_jobject *')
1 parent 56a058b commit b563131

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ val injectedPackageUid by extra(2000)
6767
val defaultManagerPackageName by extra("org.lsposed.manager")
6868
val verCode by extra(commitCount)
6969
val verName by extra(latestTag)
70-
val androidTargetSdkVersion by extra(34)
70+
val androidTargetSdkVersion by extra(35)
7171
val androidMinSdkVersion by extra(27)
72-
val androidBuildToolsVersion by extra("34.0.0")
73-
val androidCompileSdkVersion by extra(34)
74-
val androidCompileNdkVersion by extra("26.3.11579264")
72+
val androidBuildToolsVersion by extra("35.0.0")
73+
val androidCompileSdkVersion by extra(35)
74+
val androidCompileNdkVersion by extra("27.0.12077973")
7575
val androidSourceCompatibility by extra(JavaVersion.VERSION_21)
7676
val androidTargetCompatibility by extra(JavaVersion.VERSION_21)
7777

core/src/main/jni/src/context.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ namespace lspd {
8787
LOGE("Failed to get cookie");
8888
return;
8989
}
90-
lsplant::MakeDexFileTrusted(env, cookie);
90+
lsplant::MakeDexFileTrusted(env, cookie.get());
9191
}
9292
RegisterResourcesHook(env);
9393
RegisterHookBridge(env);

core/src/main/jni/src/jni/hook_bridge.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ LSP_DEF_NATIVE_METHOD(jboolean, HookBridge, hookMethod, jboolean useModernApi, j
122122
auto before_method = JNI_GetObjectField(env, callback, before_method_field);
123123
auto after_method = JNI_GetObjectField(env, callback, after_method_field);
124124
auto callback_type = ModuleCallback {
125-
.before_method = env->FromReflectedMethod(before_method),
126-
.after_method = env->FromReflectedMethod(after_method),
125+
.before_method = env->FromReflectedMethod(before_method.get()),
126+
.after_method = env->FromReflectedMethod(after_method.get()),
127127
};
128128
hook_item->modern_callbacks.emplace(priority, callback_type);
129129
} else {
@@ -144,7 +144,7 @@ LSP_DEF_NATIVE_METHOD(jboolean, HookBridge, unhookMethod, jboolean useModernApi,
144144
JNIMonitor monitor(env, backup);
145145
if (useModernApi) {
146146
auto before_method = JNI_GetObjectField(env, callback, before_method_field);
147-
auto before = env->FromReflectedMethod(before_method);
147+
auto before = env->FromReflectedMethod(before_method.get());
148148
for (auto i = hook_item->modern_callbacks.begin(); i != hook_item->modern_callbacks.end(); ++i) {
149149
if (before == i->second.before_method) {
150150
hook_item->modern_callbacks.erase(i);
@@ -312,7 +312,7 @@ LSP_DEF_NATIVE_METHOD(jobjectArray, HookBridge, callbackSnapshot, jclass callbac
312312
auto before_method = JNI_ToReflectedMethod(env, clazz, callback.second.before_method, JNI_TRUE);
313313
auto after_method = JNI_ToReflectedMethod(env, clazz, callback.second.after_method, JNI_TRUE);
314314
auto callback_object = JNI_NewObject(env, callback_class, callback_ctor, before_method, after_method);
315-
env->SetObjectArrayElement(modern, i++, env->NewLocalRef(callback_object));
315+
env->SetObjectArrayElement(modern, i++, env->NewLocalRef(callback_object.get()));
316316
}
317317
for (jsize i = 0; auto callback: hook_item->legacy_callbacks) {
318318
env->SetObjectArrayElement(legacy, i++, env->NewLocalRef(callback.second));

external/lsplant

Submodule lsplant updated 51 files

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = "8.4.0"
2+
agp = "8.6.0-beta01"
33
kotlin = "1.9.23"
44
nav = "2.7.7"
55
appcenter = "5.0.4"

0 commit comments

Comments
 (0)