Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Use findClassStatic for createHybridObject to fix crash on reload #128

Merged
merged 2 commits into from
Sep 14, 2024
Merged

fix: Use findClassStatic for createHybridObject to fix crash on reload #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12da414
fix: Use `findClassStatic` for initialization
mrousavy Sep 14, 2024
2d5d258
fix: Remove unnecessary `nullptr` check
mrousavy Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/nitrogen/src/syntax/kotlin/KotlinHybridObjectRegistration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,15 @@ export function createJNIHybridObjectRegistration({
HybridObjectRegistry::registerHybridObjectConstructor(
"${hybridObjectName}",
[]() -> std::shared_ptr<HybridObject> {
static auto javaClass = jni::findClassLocal("${jniNamespace}");
static auto javaClass = jni::findClassStatic("${jniNamespace}");
static auto defaultConstructor = javaClass->getConstructor<${JHybridTSpec}::javaobject()>();

auto instance = javaClass->newObject(defaultConstructor);
#ifndef NDEBUG
if (instance == nullptr) [[unlikely]] {
throw std::runtime_error("Failed to create an instance of \\"${JHybridTSpec}\\" - the constructor returned null!");
}
#endif
auto globalRef = jni::make_global(instance);
return JNISharedPtr::make_shared_from_jni<${JHybridTSpec}>(globalRef);
}
Expand Down
14 changes: 12 additions & 2 deletions packages/react-native-nitro-image/nitrogen/generated/android/NitroImageOnLoad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,15 @@ int initialize(JavaVM* vm) {
HybridObjectRegistry::registerHybridObjectConstructor(
"ImageFactory",
[]() -> std::shared_ptr<HybridObject> {
static auto javaClass = jni::findClassLocal("com/margelo/nitro/image/ImageFactory");
static auto javaClass = jni::findClassStatic("com/margelo/nitro/image/ImageFactory");
static auto defaultConstructor = javaClass->getConstructor<JHybridImageFactorySpec::javaobject()>();

auto instance = javaClass->newObject(defaultConstructor);
#ifndef NDEBUG
if (instance == nullptr) [[unlikely]] {
throw std::runtime_error("Failed to create an instance of \"JHybridImageFactorySpec\" - the constructor returned null!");
}
#endif
auto globalRef = jni::make_global(instance);
return JNISharedPtr::make_shared_from_jni<JHybridImageFactorySpec>(globalRef);
}
Expand All @@ -58,10 +63,15 @@ int initialize(JavaVM* vm) {
HybridObjectRegistry::registerHybridObjectConstructor(
"KotlinTestObject",
[]() -> std::shared_ptr<HybridObject> {
static auto javaClass = jni::findClassLocal("com/margelo/nitro/image/KotlinTestObject");
static auto javaClass = jni::findClassStatic("com/margelo/nitro/image/KotlinTestObject");
static auto defaultConstructor = javaClass->getConstructor<JHybridKotlinTestObjectSpec::javaobject()>();

auto instance = javaClass->newObject(defaultConstructor);
#ifndef NDEBUG
if (instance == nullptr) [[unlikely]] {
throw std::runtime_error("Failed to create an instance of \"JHybridKotlinTestObjectSpec\" - the constructor returned null!");
}
#endif
auto globalRef = jni::make_global(instance);
return JNISharedPtr::make_shared_from_jni<JHybridKotlinTestObjectSpec>(globalRef);
}
Expand Down
6 changes: 6 additions & 0 deletions packages/react-native-nitro-modules/android/src/main/cpp/registry/JHybridObjectRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ void JHybridObjectRegistry::registerHybridObjectConstructor(jni::alias_ref<jni::
HybridObjectRegistry::registerHybridObjectConstructor(hybridObjectName, [=]() -> std::shared_ptr<HybridObject> {
// 1. Call the Java initializer function
jni::local_ref<JHybridObject::javaobject> hybridObject = sharedInitializer->call();
#ifndef NDEBUG
if (hybridObject == nullptr) [[unlikely]] {
throw std::runtime_error("Failed to create HybridObject \"" + hybridObjectName + "\" - the constructor returned null!");
}
#endif

// 2. Make the resulting HybridObject a global (shared) reference
jni::global_ref<JHybridObject::javaobject> globalHybridObject = jni::make_global(hybridObject);
// 3. Create a shared_ptr from the JNI global reference
Expand Down
Loading