Use ThreadScope::WithClassLoader in setupFuture call

Author: mrousavy

android/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.4.1)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 14)
-set (CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1")
+set (CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DON_ANDROID")
 
 set (PACKAGE_NAME "rnmultithreading")
 set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)

android/src/main/cpp/cpp-adapter.cpp

@@ -31,22 +31,12 @@ struct MultithreadingModule : jni::JavaClass<MultithreadingModule> {
 
 private:
   static std::shared_ptr<react::JSExecutorFactory> makeJSExecutorFactory() {
-    std::shared_ptr<react::JSExecutorFactory> factory;
-
-    ThreadScope::WithClassLoader([&factory]() {
-      __android_log_write(ANDROID_LOG_INFO, TAG, "Calling Java method MultithreadingModule.makeJSExecutor()...");
-      static const auto cls = javaClassStatic();
-      static const auto method = cls->getStaticMethod<react::JavaScriptExecutorHolder()>("makeJSExecutor");
-      auto result = method(cls);
-      __android_log_write(ANDROID_LOG_INFO, TAG, "JavaScriptExecutor created! Getting factory...");
-      auto cxxInstance = result->cthis()->getExecutorFactory();
-      factory = cxxInstance;
-    });
-    if (factory == nullptr) {
-      throw std::runtime_error("Failed to create the JSExecutorFactory! shared_ptr was null.");
-    }
-
-    return factory;
+    __android_log_write(ANDROID_LOG_INFO, TAG, "Calling Java method MultithreadingModule.makeJSExecutor()...");
+    static const auto cls = javaClassStatic();
+    static const auto method = cls->getStaticMethod<react::JavaScriptExecutorHolder()>("makeJSExecutor");
+    auto result = method(cls);
+    __android_log_write(ANDROID_LOG_INFO, TAG, "JavaScriptExecutor created! Getting factory...");
+    return result->cthis()->getExecutorFactory();
   }
 
   static void installNative(jni::alias_ref<JClass>,
@@ -69,9 +59,6 @@ struct MultithreadingModule : jni::JavaClass<MultithreadingModule> {
     auto makeJsExecutor = []() -> std::unique_ptr<jsi::Runtime> {
       __android_log_write(ANDROID_LOG_INFO, TAG, "Creating JSExecutorFactory..");
       try {
-        // JNI needs to attach this thread because this function is being called from a different Thread
-        __unused ThreadScope scope; // RAII
-
         std::shared_ptr<react::ExecutorDelegate> delegate = std::shared_ptr<react::ExecutorDelegate>();
         std::shared_ptr<react::MessageQueueThread> jsQueue = std::shared_ptr<react::MessageQueueThread>();