Merge pull request #141 from margelo/fix/use-jni-classloader

fix: Use `ThreadScope::WithClassLoader` to access custom JNI fields
margelo · Jan 30, 2024 · a7480c3 · a7480c3
2 parents d8dae58 + 1090c11
commit a7480c3
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/cpp/WKTJsiWorkletContext.cpp b/cpp/WKTJsiWorkletContext.cpp
@@ -145,9 +145,12 @@ void JsiWorkletContext::invokeOnWorkletThread(
     auto self = weakSelf.lock();
     if (self) {
 #ifdef ANDROID
-      facebook::jni::ThreadScope scope;
-#endif
+      facebook::jni::ThreadScope::WithClassLoader([fp = std::move(fp), self]() {
+        fp(self.get(), self->getWorkletRuntime());
+      });
+#else
       fp(self.get(), self->getWorkletRuntime());
+#endif
     }
   });
 }