react-native-acoustic-connect-beta 18.0.18 → 18.0.19

package/Examples/SampleUI/package.json

@@ -29,7 +29,7 @@
     "react-native-acoustic-connect-beta": "file:.yalc/react-native-acoustic-connect-beta",
     "react-native-gesture-handler": "~2.20.2",
     "react-native-get-random-values": "^1.11.0",
-    "react-native-nitro-modules": "^0.25.2",
+    "react-native-nitro-modules": "^0.35.4",
     "react-native-paper": "^5.13.5",
     "react-native-reanimated": "~3.16.1",
     "react-native-safe-area-context": "4.12.0",

package/README.md

@@ -2,7 +2,7 @@
 
 ## Requirements
 
-- React Native v0.76.9 or higher using new architecture
+- React Native v0.78.0 or higher using new architecture
 - Node 20.0.0 or higher
 - Does not support expo
 

package/android/build.gradle

@@ -153,20 +153,15 @@ allprojects {
 }
 
 dependencies {
-  // For < 0.71, this will be from the local maven repo
-  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+  // Provided by the host app at runtime — compileOnly avoids version conflicts
   //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
+  compileOnly "com.facebook.react:react-native:+"
 
-  // Add a dependency on NitroModules
-  implementation project(":react-native-nitro-modules")
+  // Provided by the host app via react-native-nitro-modules peer dependency
+  compileOnly project(":react-native-nitro-modules")
 
-  // Connect SDK libraries
-  implementation 'io.github.go-acoustic:connect:10.4.48'
-  // implementation 'io.github.go-acoustic:connect:+'
-  // Connect SDK libraries
-  // api 'io.github.go-acoustic:connect:+'
-  // api 'io.github.go-acoustic:connect:10.4.29'
+  // Connect SDK — version overridden by config.gradle based on ConnectConfig.json
+  implementation 'io.github.go-acoustic:connect:10.4.29'
 }
 
 if (isNewArchitectureEnabled()) {

package/android/config.gradle

@@ -257,6 +257,8 @@ def updateGradle(mp, json){
     def updatedBuildGradle = buildGradleFile.text
 
     if (json != null && json.Connect) {
+        def useRelease = json.Connect.useRelease ?: false
+
         if(json.Connect.AndroidVersion != null) {
             def connectSDK = "io.github.go-acoustic:connect:"
             if(json.Connect.AndroidVersion.length() > 0) {
@@ -264,7 +266,22 @@ def updateGradle(mp, json){
             } else {
                 connectSDK += "+"
             }
-            updatedBuildGradle = updatedBuildGradle.replaceAll(~/io.github.go-acoustic:connect:(\+|\d+.\d+.\d+)/, connectSDK)
+            updatedBuildGradle = updatedBuildGradle.replaceAll(~/io.github.go-acoustic:connect:(\+|\d+\.\d+\.\d+(-beta)?)/, connectSDK)
+        }
+
+        if (useRelease) {
+            project.configurations.all {
+                resolutionStrategy {
+                    componentSelection {
+                        all { selection ->
+                            if (selection.candidate.group == 'io.github.go-acoustic' &&
+                                selection.candidate.version.endsWith('-beta')) {
+                                selection.reject("useRelease is true — rejecting beta version ${selection.candidate.version}")
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 

package/android/src/main/assets/ConnectAdvancedConfig.json

@@ -24,7 +24,7 @@
     "IpPlaceholder": "N/A",
     "KillSwitchAsync": true,
     "KillSwitchDelay": 300,
-    "LibraryVersion": "11.0.6-beta",
+    "LibraryVersion": "11.0.7-beta",
     "LogFullRequestResponsePayloads": true,
     "MessageTypeHeader": "WorklightHit",
     "MessageTypes": "4,5",

package/android/src/main/assets/TealeafAdvancedConfig.json

@@ -24,7 +24,7 @@
     "IpPlaceholder": "N/A",
     "KillSwitchAsync": true,
     "KillSwitchDelay": 300,
-    "LibraryVersion": "10.4.25-beta",
+    "LibraryVersion": "10.4.26-beta",
     "LogFullRequestResponsePayloads": true,
     "MessageTypeHeader": "WorklightHit",
     "MessageTypes": "4,5",

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

@@ -1,6 +1,9 @@
 #include <jni.h>
 #include "AcousticConnectRNOnLoad.hpp"
+#include <fbjni/fbjni.h>
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return margelo::nitro::acousticconnectrn::initialize(vm);
+  return facebook::jni::initialize(vm, []() {
+    margelo::nitro::acousticconnectrn::registerAllNatives();
+  });
 }

package/android/src/main/java/com/acousticconnectrn/HybridAcousticConnectRN.kt

@@ -55,7 +55,8 @@ import com.ibm.eo.EOCore
 import com.ibm.eo.model.EOMonitoringLevel
 import com.margelo.nitro.NitroModules.Companion.applicationContext
 import com.margelo.nitro.acousticconnectrn.HybridAcousticConnectRNSpec
-import com.margelo.nitro.acousticconnectrn.Variant_String_Double_Boolean
+import com.margelo.nitro.acousticconnectrn.Variant_Boolean_String_Double
+import com.margelo.nitro.acousticconnectrn.Variant_NullType_String
 import com.tl.uic.Tealeaf
 import com.tl.uic.model.ScreenviewType
 import com.tl.uic.util.DialogUtil
@@ -142,7 +143,7 @@ class HybridAcousticConnectRN(private val reactContext: ReactApplicationContext)
      */
     override fun setConfigItemForKey(
         key: String,
-        value: Variant_String_Double_Boolean,
+        value: Variant_Boolean_String_Double,
         moduleName: String
     ): Boolean {
         val result = EOCore.updateConfig(key, value.toString(), EOCore.getLifecycleObject(moduleName))
@@ -177,12 +178,12 @@ class HybridAcousticConnectRN(private val reactContext: ReactApplicationContext)
      * @param moduleName The class name of the module's EOLifecycleObject for which the configuration item is referencing.
      * @return String value if the operation was successful, null otherwise.
      */
-    override fun getStringItemForKey(theDefault: String, key: String, moduleName: String): String? {
+    override fun getStringItemForKey(theDefault: String, key: String, moduleName: String): Variant_NullType_String? {
         var result = EOCore.getConfigItemString(key, EOCore.getLifecycleObject(moduleName))
         if (TextUtils.isEmpty(result)) {
             result = theDefault
         }
-        return result
+        return if (result != null) Variant_NullType_String.create(result) else null
     }
 
     /**
@@ -211,7 +212,7 @@ class HybridAcousticConnectRN(private val reactContext: ReactApplicationContext)
      */
     override fun logCustomEvent(
         eventName: String,
-        values: Map<String, Variant_String_Double_Boolean>,
+        values: Map<String, Variant_Boolean_String_Double>,
         level: Double
     ): Boolean {
         val result = Connect.logCustomEvent(eventName, convertToMap(values), level.toInt())
@@ -226,7 +227,7 @@ class HybridAcousticConnectRN(private val reactContext: ReactApplicationContext)
      * @return True if the operation was successful, false otherwise.
      */
     override fun logSignal(
-        values: Map<String, Variant_String_Double_Boolean>,
+        values: Map<String, Variant_Boolean_String_Double>,
         level: Double
     ): Boolean {
         val result = Connect.logSignal(convertToMapAny(values), level.toInt())
@@ -354,7 +355,7 @@ class HybridAcousticConnectRN(private val reactContext: ReactApplicationContext)
      * @param text      The input string.
      * @return True if the operation was successful, false otherwise.
      */
-    override fun logTextChangeEvent(target: Double, controlId: String, text: String?): Boolean {
+    override fun logTextChangeEvent(target: Double, controlId: String, text: Variant_NullType_String?): Boolean {
         var result = false
         try {
             val context: ReactApplicationContext = reactContext
@@ -400,8 +401,8 @@ class HybridAcousticConnectRN(private val reactContext: ReactApplicationContext)
      * @param referrer        The referrer for the screen view.
      * @return True if the operation was successful, false otherwise.
      */
-    override fun logScreenViewContextLoad(logicalPageName: String?, referrer: String?): Boolean {
-        val result = logScreenview(getCurrentActivity()!!, logicalPageName.toString(), ScreenviewType.LOAD, referrer);
+    override fun logScreenViewContextLoad(logicalPageName: Variant_NullType_String?, referrer: Variant_NullType_String?): Boolean {
+        val result = logScreenview(getCurrentActivity()!!, logicalPageName?.asSecondOrNull().toString(), ScreenviewType.LOAD, referrer?.asSecondOrNull());
         return result
     }
 
@@ -412,8 +413,8 @@ class HybridAcousticConnectRN(private val reactContext: ReactApplicationContext)
      * @param referrer        The referrer for the screen view.
      * @return True if the operation was successful, false otherwise.
      */
-    override fun logScreenViewContextUnload(logicalPageName: String?, referrer: String?): Boolean {
-        val result = logScreenview(getCurrentActivity()!!, logicalPageName.toString(), ScreenviewType.UNLOAD, referrer);
+    override fun logScreenViewContextUnload(logicalPageName: Variant_NullType_String?, referrer: Variant_NullType_String?): Boolean {
+        val result = logScreenview(getCurrentActivity()!!, logicalPageName?.asSecondOrNull().toString(), ScreenviewType.UNLOAD, referrer?.asSecondOrNull());
         return result
     }
 
@@ -698,7 +699,7 @@ class HybridAcousticConnectRN(private val reactContext: ReactApplicationContext)
     override fun logDialogCustomEvent(
         dialogId: String,
         eventName: String,
-        values: Map<String, Variant_String_Double_Boolean>
+        values: Map<String, Variant_Boolean_String_Double>
     ): Boolean {
         var result = false
         try {
@@ -726,12 +727,12 @@ class HybridAcousticConnectRN(private val reactContext: ReactApplicationContext)
     }
 
     /**
-     * Converts a map of Variant_String_Double_Boolean to a HashMap<String?, String?>.
+     * Converts a map of Variant_Boolean_String_Double to a HashMap<String?, String?>.
      *
      * @param values The map to be converted.
      * @return A HashMap<String?, String?> representation of the input map which library can use.
      */
-    private fun convertToMap(values: Map<String, Variant_String_Double_Boolean>): HashMap<String?, String?> {
+    private fun convertToMap(values: Map<String, Variant_Boolean_String_Double>): HashMap<String?, String?> {
         val map = HashMap<String?, String?>()
         for (key in values.keys) {
             val value = values[key]
@@ -743,12 +744,12 @@ class HybridAcousticConnectRN(private val reactContext: ReactApplicationContext)
     }
 
     /**
-     * Converts a map of Variant_String_Double_Boolean to a HashMap<String?, String?>.
+     * Converts a map of Variant_Boolean_String_Double to a HashMap<String?, String?>.
      *
      * @param values The map to be converted.
      * @return A HashMap<String?, String?> representation of the input map which library can use.
      */
-    private fun convertToMapAny(values: Map<String, Variant_String_Double_Boolean>): java.util.HashMap<String?, Any?>? {
+    private fun convertToMapAny(values: Map<String, Variant_Boolean_String_Double>): java.util.HashMap<String?, Any?>? {
         val map = HashMap<String?, Any?>()
         for (key in values.keys) {
             val value = values[key]

package/ios/HybridAcousticConnectRN.swift

@@ -149,7 +149,7 @@ class HybridAcousticConnectRN: HybridAcousticConnectRNSpec {
     ///   - value: Value to use.
     ///   - moduleName: The name of the module to be updated. For EOCore settings, please use 'EOCore' which can be found the following files EOCoreBasicConfig.plist, EOCoreBasicConfig.properties or EOCoreAdvancedConfig.json and 'Connect' for Connect which can be found the following files ConnectBasicConfig.plist, ConnectBasicConfig.properties or ConnectAdvancedConfig.json.
     /// - Returns: Whether it was able to set the value.
-    func setConfigItemForKey(key: String, value: Variant_String_Double_Bool, moduleName: String) throws -> Bool {
+    func setConfigItemForKey(key: String, value: Variant_Bool_String_Double, moduleName: String) throws -> Bool {
       var result = EOApplicationHelper().setConfigItem(key, value: convertVariantToAny(value), forModuleName: moduleName)
       return true
     }
@@ -171,9 +171,9 @@ class HybridAcousticConnectRN: HybridAcousticConnectRNSpec {
     ///   - theDefault: Default value if not found.
     ///   - moduleName: The name of the module to be updated. For EOCore settings, please use 'EOCore' which can be found the following files EOCoreBasicConfig.plist, EOCoreBasicConfig.properties or EOCoreAdvancedConfig.json and 'Connect' for Connect which can be found the following files ConnectBasicConfig.plist, ConnectBasicConfig.properties or ConnectAdvancedConfig.json.
     /// - Returns: The value of the configuration item key as a NString value.
-    func getStringItemForKey(theDefault: String, key: String, moduleName: String) throws -> String? {
-        var result = EOApplicationHelper().getStringItem(forKey: key, withDefault: theDefault, forModuleName: moduleName)
-        return result
+    func getStringItemForKey(theDefault: String, key: String, moduleName: String) throws -> Variant_NullType_String? {
+        let result = EOApplicationHelper().getStringItem(forKey: key, withDefault: theDefault, forModuleName: moduleName)
+        return result.map { .second($0) }
     }
     
     /// Gets the module's configuration item from AdvancedConfig.json or BasicConfig.plist that matches the specified key as a NSNumber value.
@@ -193,7 +193,7 @@ class HybridAcousticConnectRN: HybridAcousticConnectRNSpec {
     ///   - values: additional key value pairs to be logged with the message.
     ///   - level: set a custom log level to the event.
     /// - Returns: Boolean value will return whether it was able to log the custom event.
-    func logCustomEvent(eventName: String, values: Dictionary<String, Variant_String_Double_Bool>, level: Double) throws -> Bool {
+    func logCustomEvent(eventName: String, values: Dictionary<String, Variant_Bool_String_Double>, level: Double) throws -> Bool {
         let logLevel = try getLogLevel(level: level)
         let result = ConnectCustomEvent().logEvent(eventName, values: convertToAnyDictionary(input: values), level: logLevel)
         return result
@@ -204,7 +204,7 @@ class HybridAcousticConnectRN: HybridAcousticConnectRNSpec {
     ///   - values: additional key value pairs to be logged with the signal message.
     ///   - level: set a custom log level to the event.
     /// - Returns: Boolean value will return whether it was able to log the signal message.
-    func logSignal(values: Dictionary<String, Variant_String_Double_Bool>, level: Double) throws -> Bool {
+    func logSignal(values: Dictionary<String, Variant_Bool_String_Double>, level: Double) throws -> Bool {
         let logLevel = try getLogLevel(level: level)
         let result = ConnectCustomEvent().logSignal(convertToAnyDictionary(input: values), level: logLevel)
         return result
@@ -265,12 +265,12 @@ class HybridAcousticConnectRN: HybridAcousticConnectRNSpec {
     ///   - controlId: Control id a component from React Native.
     ///   - text: The input string from txt control.
     /// - Returns: Boolean value will return whether it was able to log the text change event.
-    func logTextChangeEvent(target: Double, controlId: String, text: String?) throws -> Bool {
+    func logTextChangeEvent(target: Double, controlId: String, text: Variant_NullType_String?) throws -> Bool {
         let view:UIView? = nil
         var data: [String: Any] = [:]
-        
-        if let unwrappedText = text {
-            data["text"] = unwrappedText
+
+        if case .second(let str) = text {
+            data["text"] = str
         }
         let result = ConnectCustomEvent().logTextChange(view, controlId: controlId, data: data)
         return result
@@ -289,9 +289,11 @@ class HybridAcousticConnectRN: HybridAcousticConnectRNSpec {
     ///   - logicalPageName: Page name or title e.g. "Login View Controller"; Must not be empty.
     ///   - referrer: Page name or title that loads logicalPageName. Could be empty.
     /// - Returns: Boolean value will return whether it was able to log the screenview event.
-    func logScreenViewContextLoad(logicalPageName: String?, referrer: String?) throws -> Bool {
-        let cllasss = logicalPageName == nil ? "ReactNative" : "ReactNative_\(logicalPageName)"
-        let result = ConnectCustomEvent().logScreenViewContext(logicalPageName, withClass: cllasss, applicationContext: ConnectScreenViewType.load, referrer: referrer)
+    func logScreenViewContextLoad(logicalPageName: Variant_NullType_String?, referrer: Variant_NullType_String?) throws -> Bool {
+        let pageName: String? = { if case .second(let s) = logicalPageName { return s }; return nil }()
+        let ref: String? = { if case .second(let s) = referrer { return s }; return nil }()
+        let cllasss = pageName == nil ? "ReactNative" : "ReactNative_\(pageName!)"
+        let result = ConnectCustomEvent().logScreenViewContext(pageName, withClass: cllasss, applicationContext: ConnectScreenViewType.load, referrer: ref)
         return result
     }
     
@@ -300,9 +302,11 @@ class HybridAcousticConnectRN: HybridAcousticConnectRNSpec {
     ///   - logicalPageName: Page name or title e.g. "Login View Controller"; Must not be empty.
     ///   - referrer: Page name or title that loads logicalPageName. Could be empty.
     /// - Returns: Boolean value will return whether it was able to log the screenview event.
-    func logScreenViewContextUnload(logicalPageName: String?, referrer: String?) throws -> Bool {
-        let cllasss = logicalPageName == nil ? "ReactNative" : "ReactNative_\(logicalPageName)"
-        let result = ConnectCustomEvent().logScreenViewContext(logicalPageName, withClass: cllasss, applicationContext: ConnectScreenViewType.unload, referrer: referrer)
+    func logScreenViewContextUnload(logicalPageName: Variant_NullType_String?, referrer: Variant_NullType_String?) throws -> Bool {
+        let pageName: String? = { if case .second(let s) = logicalPageName { return s }; return nil }()
+        let ref: String? = { if case .second(let s) = referrer { return s }; return nil }()
+        let cllasss = pageName == nil ? "ReactNative" : "ReactNative_\(pageName!)"
+        let result = ConnectCustomEvent().logScreenViewContext(pageName, withClass: cllasss, applicationContext: ConnectScreenViewType.unload, referrer: ref)
         return result
     }
     
@@ -382,7 +386,7 @@ class HybridAcousticConnectRN: HybridAcousticConnectRNSpec {
     ///   - eventName: The name of the custom event.
     ///   - values: A map of values associated with the event.
     /// - Returns: Boolean value will return whether it was able to log the dialog custom event.
-    func logDialogCustomEvent(dialogId: String, eventName: String, values: Dictionary<String, Variant_String_Double_Bool>) throws -> Bool {
+    func logDialogCustomEvent(dialogId: String, eventName: String, values: Dictionary<String, Variant_Bool_String_Double>) throws -> Bool {
         var eventValues: [String: Any] = [
             "dialogId": dialogId,
             "customEventName": eventName,
@@ -406,31 +410,31 @@ class HybridAcousticConnectRN: HybridAcousticConnectRNSpec {
         return moduleName
     }
   
-    func convertToAnyDictionary(input: [String: Variant_String_Double_Bool]) -> [String: Any] {
+    func convertToAnyDictionary(input: [String: Variant_Bool_String_Double]) -> [String: Any] {
         var result: [String: Any] = [:]
-        
+
         for (key, value) in input {
             switch value {
-            case .first(let stringValue):
+            case .first(let boolValue):
+                result[key] = boolValue
+            case .second(let stringValue):
                 result[key] = stringValue
-            case .second(let doubleValue):
+            case .third(let doubleValue):
                 result[key] = doubleValue
-            case .third(let boolValue):
-                result[key] = boolValue
             }
         }
-        
+
         return result
     }
-  
-    func convertVariantToAny(_ variant: Variant_String_Double_Bool) -> Any {
+
+    func convertVariantToAny(_ variant: Variant_Bool_String_Double) -> Any {
         switch variant {
-        case .first(let stringValue):
+        case .first(let boolValue):
+            return boolValue
+        case .second(let stringValue):
             return stringValue
-        case .second(let doubleValue):
+        case .third(let doubleValue):
             return doubleValue
-        case .third(let boolValue):
-            return boolValue
         }
     }
     

package/nitrogen/generated/.gitattributes

@@ -1 +1 @@
-* linguist-generated
+** linguist-generated=true

package/nitrogen/generated/android/AcousticConnectRN+autolinking.cmake

@@ -2,7 +2,7 @@
 # AcousticConnectRN+autolinking.cmake
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2026 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a CMake file that adds all files generated by Nitrogen
@@ -13,6 +13,12 @@
 # include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/AcousticConnectRN+autolinking.cmake)
 # ```
 
+# Define a flag to check if we are building properly
+add_definitions(-DBUILDING_ACOUSTICCONNECTRN_WITH_GENERATED_CMAKE_PROJECT)
+
+# Enable Raw Props parsing in react-native (for Nitro Views)
+add_definitions(-DRN_SERIALIZABLE_STATE)
+
 # Add all headers that were generated by Nitrogen
 include_directories(
   "../nitrogen/generated/shared/c++"
@@ -30,14 +36,13 @@ target_sources(
   ../nitrogen/generated/shared/c++/HybridAcousticConnectRNSpec.cpp
   # Android-specific Nitrogen C++ sources
   ../nitrogen/generated/android/c++/JHybridAcousticConnectRNSpec.cpp
+  ../nitrogen/generated/android/c++/JVariant_NullType_String.cpp
+  ../nitrogen/generated/android/c++/JVariant_Boolean_String_Double.cpp
 )
 
-# Define a flag to check if we are building properly
-add_definitions(-DBUILDING_ACOUSTICCONNECTRN_WITH_GENERATED_CMAKE_PROJECT)
-
 # From node_modules/react-native/ReactAndroid/cmake-utils/folly-flags.cmake
 # Used in node_modules/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
- target_compile_definitions(
+target_compile_definitions(
   AcousticConnectRN PRIVATE
   -DFOLLY_NO_CONFIG=1
   -DFOLLY_HAVE_CLOCK_GETTIME=1

package/nitrogen/generated/android/AcousticConnectRN+autolinking.gradle

@@ -2,7 +2,7 @@
 /// AcousticConnectRN+autolinking.gradle
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /// This is a Gradle file that adds all files generated by Nitrogen

package/nitrogen/generated/android/AcousticConnectRNOnLoad.cpp

@@ -2,7 +2,7 @@
 /// AcousticConnectRNOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #ifndef BUILDING_ACOUSTICCONNECTRN_WITH_GENERATED_CMAKE_PROJECT
@@ -16,31 +16,39 @@
 #include <NitroModules/HybridObjectRegistry.hpp>
 
 #include "JHybridAcousticConnectRNSpec.hpp"
-#include <NitroModules/JNISharedPtr.hpp>
 #include <NitroModules/DefaultConstructableObject.hpp>
 
 namespace margelo::nitro::acousticconnectrn {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::acousticconnectrn::registerAllNatives();
+  });
+}
+
+struct JHybridAcousticConnectRNSpecImpl: public jni::JavaClass<JHybridAcousticConnectRNSpecImpl, JHybridAcousticConnectRNSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/acousticconnectrn/HybridAcousticConnectRN;";
+  static std::shared_ptr<JHybridAcousticConnectRNSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridAcousticConnectRNSpecImpl::javaobject()>();
+    jni::local_ref<JHybridAcousticConnectRNSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridAcousticConnectRNSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::acousticconnectrn;
-  using namespace facebook;
-
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::acousticconnectrn::JHybridAcousticConnectRNSpec::registerNatives();
-
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "AcousticConnectRN",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridAcousticConnectRNSpec::javaobject> object("com/acousticconnectrn/HybridAcousticConnectRN");
-        auto instance = object.create();
-        auto globalRef = jni::make_global(instance);
-        return JNISharedPtr::make_shared_from_jni<JHybridAcousticConnectRNSpec>(globalRef);
-      }
-    );
-  });
+
+  // Register native JNI methods
+  margelo::nitro::acousticconnectrn::JHybridAcousticConnectRNSpec::CxxPart::registerNatives();
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "AcousticConnectRN",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridAcousticConnectRNSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::acousticconnectrn

package/nitrogen/generated/android/AcousticConnectRNOnLoad.hpp

@@ -2,24 +2,33 @@
 /// AcousticConnectRNOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::acousticconnectrn {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of AcousticConnectRN, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of AcousticConnectRN, and autolinks all Hybrid Objects.
+   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`),
+   * inside a `facebook::jni::initialize(vm, ...)` call.
    * Example:
    * ```cpp (cpp-adapter.cpp)
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-   *   return margelo::nitro::acousticconnectrn::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all AcousticConnectRN HybridObjects
+   *     margelo::nitro::acousticconnectrn::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::acousticconnectrn