react-native-picture-selector 1.0.11 → 1.0.13

package/android/CMakeLists.txt

@@ -10,10 +10,29 @@ add_library(${CMAKE_PROJECT_NAME} SHARED)
 # Autolinking cmake handles: find_package, target_sources, target_link_libraries
 include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/NitroPictureSelector+autolinking.cmake)
 
+# cpp-adapter.cpp defines JNI_OnLoad — the entry point called by the JVM when
+# System.loadLibrary("NitroPictureSelector") is invoked from Kotlin.
+# It calls facebook::jni::initialize(vm, ...) and then registerAllNatives(),
+# which inserts "PictureSelector" into Nitro's HybridObjectRegistry.
+# Without this file the library loads silently but nothing gets registered.
+target_sources(${CMAKE_PROJECT_NAME} PRIVATE
+  src/main/cpp/cpp-adapter.cpp
+)
+
 # Directly link libNitroModules.so from its stable cmake build output path.
 # The prefab for react-native-nitro-modules is header-only at CMake configure
 # time (fix-prefab.gradle updates it only after native build), so we link
 # the .so directly to avoid undefined symbol errors on fresh builds.
+#
+# Use a generator expression so the correct variant (debug/release) is picked
+# automatically — avoids breaking assembleRelease / EAS production builds.
+string(TOLOWER "${CMAKE_BUILD_TYPE}" _build_type_lower)
+if(_build_type_lower STREQUAL "release")
+  set(NITRO_BUILD_VARIANT "release")
+else()
+  set(NITRO_BUILD_VARIANT "debug")
+endif()
+
 target_link_libraries(${CMAKE_PROJECT_NAME}
-  ${CMAKE_SOURCE_DIR}/../../react-native-nitro-modules/android/build/intermediates/cmake/debug/obj/${ANDROID_ABI}/libNitroModules.so
+  ${CMAKE_SOURCE_DIR}/../../react-native-nitro-modules/android/build/intermediates/cmake/${NITRO_BUILD_VARIANT}/obj/${ANDROID_ABI}/libNitroModules.so
 )

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

@@ -0,0 +1,26 @@
+///
+/// cpp-adapter.cpp
+/// Entry point for the NitroPictureSelector shared library.
+///
+/// Defines JNI_OnLoad so that when Kotlin calls
+///   System.loadLibrary("NitroPictureSelector")
+/// the JVM invokes this function with the JavaVM*, which:
+///   1. Initialises fbjni (facebook::jni::initialize)
+///   2. Calls registerAllNatives() — which registers JNI methods and
+///      inserts "PictureSelector" into Nitro's HybridObjectRegistry.
+///
+/// Without this entry point System.loadLibrary succeeds silently but
+/// nothing ever gets registered, so every call to
+///   NitroModules.createHybridObject("PictureSelector")
+/// throws "It has not yet been registered in the HybridObjectRegistry".
+///
+
+#include <jni.h>
+#include <fbjni/fbjni.h>
+#include "NitroPictureSelectorOnLoad.hpp"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+  return facebook::jni::initialize(vm, []() {
+    margelo::pictureselector::registerAllNatives();
+  });
+}

package/android/src/main/kotlin/com/margelo/pictureselector/HybridPictureSelector.kt

@@ -6,6 +6,7 @@ import com.luck.picture.lib.basic.PictureSelector
 import com.luck.picture.lib.config.SelectMimeType
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
+import com.margelo.nitro.NitroModules
 import com.margelo.nitro.core.Promise
 import com.margelo.nitro.com.margelo.pictureselector.HybridHybridPictureSelectorSpec
 import com.margelo.nitro.com.margelo.pictureselector.MediaAsset
@@ -34,20 +35,29 @@ import kotlin.coroutines.suspendCoroutine
  * Nitro HybridObject implementation for the Android side.
  *
  * Extends the nitrogen-generated [HybridHybridPictureSelectorSpec] which provides
- * the JSI bridge. The [reactContext] is injected by [NitroPictureSelectorPackage].
+ * the JSI bridge.
+ *
+ * No-arg constructor — the [ReactApplicationContext] is obtained lazily from
+ * [NitroModules.applicationContext], which is set during Nitro initialisation
+ * (before any JS call can reach this object). This allows the C++ factory in
+ * NitroPictureSelectorOnLoad.cpp to register us with a zero-argument lambda
+ * as required by [HybridObjectRegistry.registerHybridObjectConstructor].
  *
  * Threading contract:
  * - [openPicker] and [openCamera] are called on the JS thread.
  * - PictureSelector.create(...).openGallery() must be called on the Main thread.
  * - We switch to Main via [withContext(Dispatchers.Main)] inside Promise.async.
- *
- * API REQUIRES VERIFICATION:
- * - Confirm Promise.async accepts a CoroutineContext parameter in the version
- *   of react-native-nitro-modules used.
  */
-class HybridPictureSelector(
-  private val reactContext: ReactApplicationContext,
-) : HybridHybridPictureSelectorSpec() {
+class HybridPictureSelector : HybridHybridPictureSelectorSpec() {
+
+  // Obtained lazily — NitroModules sets applicationContext during module init,
+  // which always happens before the first JS call to openPicker / openCamera.
+  private val reactContext: ReactApplicationContext
+    get() = NitroModules.applicationContext
+      ?: throw PictureSelectorException(
+        "UNKNOWN",
+        "NitroModules is not yet initialised. Make sure NitroModules is set up in your app."
+      )
 
   // ─────────────────────────────────────────────────────────────────────────
   // Public API

package/nitrogen/generated/android/NitroPictureSelectorOnLoad.cpp

@@ -35,7 +35,29 @@ void registerAllNatives() {
   margelo::pictureselector::JHybridHybridPictureSelectorSpec::CxxPart::registerNatives();
 
   // Register Nitro Hybrid Objects
-  
+  //
+  // HybridPictureSelector has a no-arg constructor and obtains its
+  // ReactApplicationContext from NitroModules.applicationContext (set during
+  // Nitro initialisation, before any JS call can reach this factory).
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "PictureSelector",
+    []() -> std::shared_ptr<HybridObject> {
+      // Locate the concrete Kotlin implementation class
+      static const auto klass =
+        jni::findClassStatic("com/margelo/pictureselector/HybridPictureSelector");
+      // Invoke the no-arg constructor.
+      // fbjni deduces the return type of newObject() from the template argument of
+      // getConstructor<F>().  Using void() would produce local_ref<void> which is not
+      // a valid fbjni reference type.  Using jni::JObject::javaobject() makes newObject()
+      // return local_ref<JObject>, which can then be safely cast with dynamic_ref_cast.
+      static const auto ctor = klass->getConstructor<jni::JObject::javaobject()>();
+      auto javaInstance = klass->newObject(ctor);
+      // Downcast to the spec JavaPart so JHybridHybridPictureSelectorSpec can wrap it
+      auto javaPart =
+        jni::dynamic_ref_cast<JHybridHybridPictureSelectorSpec::JavaPart>(javaInstance);
+      return std::make_shared<JHybridHybridPictureSelectorSpec>(javaPart);
+    }
+  );
 }
 
 } // namespace margelo::pictureselector

package/nitrogen/generated/shared/c++/HybridHybridPictureSelectorSpec.hpp

@@ -62,8 +62,9 @@ namespace margelo::pictureselector {
       void loadHybridMethods() override;
 
     protected:
-      // Tag for logging
-      static constexpr auto TAG = "HybridPictureSelector";
+      // Tag for logging — must match the key used in registerHybridObjectConstructor()
+      // and in NitroModules.createHybridObject() on the JS side ("PictureSelector").
+      static constexpr auto TAG = "PictureSelector";
   };
 
 } // namespace margelo::pictureselector

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-picture-selector",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "High-performance photo/video picker for React Native using Nitro Modules",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",