Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Harden jni_find_class() and its setup/cleanup

Browse Source
This commit is contained in:
Serhii Snitsaruk
2025-08-02 09:49:25 +02:00
parent c2202d36c1
commit 4749ce1637
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platform/android/jni_utils.cpp
View File

@@ -518,6 +518,10 @@ void setup_android_class_loader() {
// This ClassLoader will be used by jni_find_class() to locate classes at runtime // This ClassLoader will be used by jni_find_class() to locate classes at runtime
// in a thread-safe manner, avoiding issues with FindClass in non-main threads. // in a thread-safe manner, avoiding issues with FindClass in non-main threads.
if (android_class_loader) {
cleanup_android_class_loader();
}
JNIEnv *env = get_jni_env(); JNIEnv *env = get_jni_env();
ERR_FAIL_NULL(env); ERR_FAIL_NULL(env);
@@ -553,12 +557,23 @@ void cleanup_android_class_loader() {
JNIEnv *env = get_jni_env(); JNIEnv *env = get_jni_env();
if (env) { if (env) {
env->DeleteGlobalRef(android_class_loader); env->DeleteGlobalRef(android_class_loader);
android_class_loader = nullptr; } else {
ERR_PRINT("Failed to release Android ClassLoader - JNIEnv is not available.");
} }
android_class_loader = nullptr;
load_class_method = nullptr;
} }
} }
jclass jni_find_class(JNIEnv *p_env, const char *p_class_name) { jclass jni_find_class(JNIEnv *p_env, const char *p_class_name) {
ERR_FAIL_NULL_V(p_env, nullptr);
ERR_FAIL_NULL_V(p_class_name, nullptr);
if (!android_class_loader || !load_class_method) {
ERR_PRINT("Android ClassLoader is not initialized. Falling back to FindClass.");
return p_env->FindClass(p_class_name);
}
jstring java_class_name = p_env->NewStringUTF(p_class_name); jstring java_class_name = p_env->NewStringUTF(p_class_name);
jobject class_object = p_env->CallObjectMethod( jobject class_object = p_env->CallObjectMethod(
android_class_loader, android_class_loader,