@onekeyfe/react-native-bundle-crypto 3.0.81 → 3.0.85

package/nitrogen/generated/android/c++/JDirHashEntry.hpp

@@ -2,7 +2,7 @@
 /// JDirHashEntry.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
 ///
 
 #pragma once
@@ -21,7 +21,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
    */
   struct JDirHashEntry final: public jni::JavaClass<JDirHashEntry> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/DirHashEntry;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/DirHashEntry;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JHybridReactNativeBundleCryptoSpec.cpp

@@ -2,7 +2,7 @@
 /// JHybridReactNativeBundleCryptoSpec.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
 ///
 
 #include "JHybridReactNativeBundleCryptoSpec.hpp"
@@ -29,33 +29,35 @@ namespace margelo::nitro::reactnativebundlecrypto { struct DirHashEntry; }
 #include "DirHashEntry.hpp"
 #include <vector>
 #include "JDirHashEntry.hpp"
+#include <NitroModules/JUnit.hpp>
 
 namespace margelo::nitro::reactnativebundlecrypto {
 
-  jni::local_ref<JHybridReactNativeBundleCryptoSpec::jhybriddata> JHybridReactNativeBundleCryptoSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridReactNativeBundleCryptoSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridReactNativeBundleCryptoSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridReactNativeBundleCryptoSpec> JHybridReactNativeBundleCryptoSpec::JavaPart::getJHybridReactNativeBundleCryptoSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridReactNativeBundleCryptoSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridReactNativeBundleCryptoSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridReactNativeBundleCryptoSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridReactNativeBundleCryptoSpec::CxxPart::jhybriddata> JHybridReactNativeBundleCryptoSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  void JHybridReactNativeBundleCryptoSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+  std::shared_ptr<JHybridObject> JHybridReactNativeBundleCryptoSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridReactNativeBundleCryptoSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridReactNativeBundleCryptoSpec::JavaPart!");
+    }
+    return std::make_shared<JHybridReactNativeBundleCryptoSpec>(castJavaPart);
   }
 
-  std::string JHybridReactNativeBundleCryptoSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridReactNativeBundleCryptoSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridReactNativeBundleCryptoSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -63,7 +65,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
 
   // Methods
   std::shared_ptr<Promise<VerifyGpgCleartextResult>> JHybridReactNativeBundleCryptoSpec::verifyGpgCleartext(const std::string& signedMessage) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* signedMessage */)>("verifyGpgCleartext");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* signedMessage */)>("verifyGpgCleartext");
     auto __result = method(_javaPart, jni::make_jstring(signedMessage));
     return [&]() {
       auto __promise = Promise<VerifyGpgCleartextResult>::create();
@@ -79,7 +81,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
     }();
   }
   std::shared_ptr<Promise<VerifyDetachedAscResult>> JHybridReactNativeBundleCryptoSpec::verifyDetachedAsc(const std::string& ascContent) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* ascContent */)>("verifyDetachedAsc");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* ascContent */)>("verifyDetachedAsc");
     auto __result = method(_javaPart, jni::make_jstring(ascContent));
     return [&]() {
       auto __promise = Promise<VerifyDetachedAscResult>::create();
@@ -95,7 +97,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
     }();
   }
   std::shared_ptr<Promise<Sha256Result>> JHybridReactNativeBundleCryptoSpec::sha256OfFile(const std::string& filePath) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* filePath */)>("sha256OfFile");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* filePath */)>("sha256OfFile");
     auto __result = method(_javaPart, jni::make_jstring(filePath));
     return [&]() {
       auto __promise = Promise<Sha256Result>::create();
@@ -111,12 +113,12 @@ namespace margelo::nitro::reactnativebundlecrypto {
     }();
   }
   bool JHybridReactNativeBundleCryptoSpec::secureEqualHex(const std::string& a, const std::string& b) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* a */, jni::alias_ref<jni::JString> /* b */)>("secureEqualHex");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* a */, jni::alias_ref<jni::JString> /* b */)>("secureEqualHex");
     auto __result = method(_javaPart, jni::make_jstring(a), jni::make_jstring(b));
     return static_cast<bool>(__result);
   }
   std::shared_ptr<Promise<bool>> JHybridReactNativeBundleCryptoSpec::verifyDirAgainstHashes(const std::string& dirPath, const std::vector<DirHashEntry>& entries) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* dirPath */, jni::alias_ref<jni::JArrayClass<JDirHashEntry>> /* entries */)>("verifyDirAgainstHashes");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* dirPath */, jni::alias_ref<jni::JArrayClass<JDirHashEntry>> /* entries */)>("verifyDirAgainstHashes");
     auto __result = method(_javaPart, jni::make_jstring(dirPath), [&]() {
       size_t __size = entries.size();
       jni::local_ref<jni::JArrayClass<JDirHashEntry>> __array = jni::JArrayClass<JDirHashEntry>::newArray(__size);
@@ -141,7 +143,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
     }();
   }
   std::shared_ptr<Promise<std::vector<DirHashEntry>>> JHybridReactNativeBundleCryptoSpec::hashDir(const std::string& dirPath) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* dirPath */)>("hashDir");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* dirPath */)>("hashDir");
     auto __result = method(_javaPart, jni::make_jstring(dirPath));
     return [&]() {
       auto __promise = Promise<std::vector<DirHashEntry>>::create();
@@ -166,7 +168,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
     }();
   }
   std::shared_ptr<Promise<bool>> JHybridReactNativeBundleCryptoSpec::validateExtractedPathSafety(const std::string& destination) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* destination */)>("validateExtractedPathSafety");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* destination */)>("validateExtractedPathSafety");
     auto __result = method(_javaPart, jni::make_jstring(destination));
     return [&]() {
       auto __promise = Promise<bool>::create();
@@ -182,7 +184,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
     }();
   }
   std::shared_ptr<Promise<void>> JHybridReactNativeBundleCryptoSpec::atomicWriteFile(const std::string& filePath, const std::string& contentUtf8) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* filePath */, jni::alias_ref<jni::JString> /* contentUtf8 */)>("atomicWriteFile");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* filePath */, jni::alias_ref<jni::JString> /* contentUtf8 */)>("atomicWriteFile");
     auto __result = method(_javaPart, jni::make_jstring(filePath), jni::make_jstring(contentUtf8));
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -197,7 +199,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
     }();
   }
   std::shared_ptr<Promise<void>> JHybridReactNativeBundleCryptoSpec::safeRename(const std::string& fromPath, const std::string& toPath) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* fromPath */, jni::alias_ref<jni::JString> /* toPath */)>("safeRename");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* fromPath */, jni::alias_ref<jni::JString> /* toPath */)>("safeRename");
     auto __result = method(_javaPart, jni::make_jstring(fromPath), jni::make_jstring(toPath));
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -212,7 +214,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
     }();
   }
   std::shared_ptr<Promise<std::vector<std::string>>> JHybridReactNativeBundleCryptoSpec::listVersionDirs(const std::string& parentDir) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* parentDir */)>("listVersionDirs");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* parentDir */)>("listVersionDirs");
     auto __result = method(_javaPart, jni::make_jstring(parentDir));
     return [&]() {
       auto __promise = Promise<std::vector<std::string>>::create();

package/nitrogen/generated/android/c++/JHybridReactNativeBundleCryptoSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridReactNativeBundleCryptoSpec.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
 ///
 
 #pragma once
@@ -18,33 +18,33 @@ namespace margelo::nitro::reactnativebundlecrypto {
 
   using namespace facebook;
 
-  class JHybridReactNativeBundleCryptoSpec: public jni::HybridClass<JHybridReactNativeBundleCryptoSpec, JHybridObject>,
-                                            public virtual HybridReactNativeBundleCryptoSpec {
+  class JHybridReactNativeBundleCryptoSpec: public virtual HybridReactNativeBundleCryptoSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/HybridReactNativeBundleCryptoSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridReactNativeBundleCryptoSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridReactNativeBundleCryptoSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/HybridReactNativeBundleCryptoSpec;";
+      std::shared_ptr<JHybridReactNativeBundleCryptoSpec> getJHybridReactNativeBundleCryptoSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/HybridReactNativeBundleCryptoSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridReactNativeBundleCryptoSpec(const jni::local_ref<JHybridReactNativeBundleCryptoSpec::JavaPart>& javaPart):
+      HybridObject(HybridReactNativeBundleCryptoSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridReactNativeBundleCryptoSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridReactNativeBundleCryptoSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridReactNativeBundleCryptoSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -66,9 +66,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
     std::shared_ptr<Promise<std::vector<std::string>>> listVersionDirs(const std::string& parentDir) override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridReactNativeBundleCryptoSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridReactNativeBundleCryptoSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::reactnativebundlecrypto

package/nitrogen/generated/android/c++/JSha256Result.hpp

@@ -2,7 +2,7 @@
 /// JSha256Result.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
 ///
 
 #pragma once
@@ -22,7 +22,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
    */
   struct JSha256Result final: public jni::JavaClass<JSha256Result> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/Sha256Result;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/Sha256Result;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JVerifyDetachedAscResult.hpp

@@ -2,7 +2,7 @@
 /// JVerifyDetachedAscResult.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
 ///
 
 #pragma once
@@ -22,7 +22,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
    */
   struct JVerifyDetachedAscResult final: public jni::JavaClass<JVerifyDetachedAscResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/VerifyDetachedAscResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/VerifyDetachedAscResult;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JVerifyGpgCleartextResult.hpp

@@ -2,7 +2,7 @@
 /// JVerifyGpgCleartextResult.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
 ///
 
 #pragma once
@@ -22,7 +22,7 @@ namespace margelo::nitro::reactnativebundlecrypto {
    */
   struct JVerifyGpgCleartextResult final: public jni::JavaClass<JVerifyGpgCleartextResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/VerifyGpgCleartextResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/VerifyGpgCleartextResult;";
 
   public:
     /**

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativebundlecrypto/DirHashEntry.kt

@@ -2,7 +2,7 @@
 /// DirHashEntry.kt
 /// 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
 ///
 
 package com.margelo.nitro.reactnativebundlecrypto
@@ -26,7 +26,7 @@ data class DirHashEntry(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativebundlecrypto/HybridReactNativeBundleCryptoSpec.kt

@@ -2,7 +2,7 @@
 /// HybridReactNativeBundleCryptoSpec.kt
 /// 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
 ///
 
 package com.margelo.nitro.reactnativebundlecrypto
@@ -25,23 +25,6 @@ import com.margelo.nitro.core.HybridObject
   "LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
 )
 abstract class HybridReactNativeBundleCryptoSpec: HybridObject() {
-  @DoNotStrip
-  private var mHybridData: HybridData = initHybrid()
-
-  init {
-    super.updateNative(mHybridData)
-  }
-
-  override fun updateNative(hybridData: HybridData) {
-    mHybridData = hybridData
-    super.updateNative(hybridData)
-  }
-
-  // Default implementation of `HybridObject.toString()`
-  override fun toString(): String {
-    return "[HybridObject ReactNativeBundleCrypto]"
-  }
-
   // Properties
   
 
@@ -86,7 +69,21 @@ abstract class HybridReactNativeBundleCryptoSpec: HybridObject() {
   @Keep
   abstract fun listVersionDirs(parentDir: String): Promise<Array<String>>
 
-  private external fun initHybrid(): HybridData
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject ReactNativeBundleCrypto]"
+  }
+
+  // C++ backing class
+  @DoNotStrip
+  @Keep
+  protected open class CxxPart(javaPart: HybridReactNativeBundleCryptoSpec): HybridObject.CxxPart(javaPart) {
+    // C++ JHybridReactNativeBundleCryptoSpec::CxxPart::initHybrid(...)
+    external override fun initHybrid(): HybridData
+  }
+  override fun createCxxPart(): CxxPart {
+    return CxxPart(this)
+  }
 
   companion object {
     protected const val TAG = "HybridReactNativeBundleCryptoSpec"

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativebundlecrypto/Sha256Result.kt

@@ -2,7 +2,7 @@
 /// Sha256Result.kt
 /// 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
 ///
 
 package com.margelo.nitro.reactnativebundlecrypto
@@ -26,7 +26,7 @@ data class Sha256Result(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativebundlecrypto/VerifyDetachedAscResult.kt

@@ -2,7 +2,7 @@
 /// VerifyDetachedAscResult.kt
 /// 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
 ///
 
 package com.margelo.nitro.reactnativebundlecrypto
@@ -29,7 +29,7 @@ data class VerifyDetachedAscResult(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativebundlecrypto/VerifyGpgCleartextResult.kt

@@ -2,7 +2,7 @@
 /// VerifyGpgCleartextResult.kt
 /// 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
 ///
 
 package com.margelo.nitro.reactnativebundlecrypto
@@ -29,7 +29,7 @@ data class VerifyGpgCleartextResult(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativebundlecrypto/reactnativebundlecryptoOnLoad.kt

@@ -2,7 +2,7 @@
 /// reactnativebundlecryptoOnLoad.kt
 /// 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
 ///
 
 package com.margelo.nitro.reactnativebundlecrypto

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

@@ -2,7 +2,7 @@
 # reactnativebundlecrypto+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

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

@@ -2,7 +2,7 @@
 /// reactnativebundlecrypto+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/reactnativebundlecryptoOnLoad.cpp

@@ -2,7 +2,7 @@
 /// reactnativebundlecryptoOnLoad.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_REACTNATIVEBUNDLECRYPTO_WITH_GENERATED_CMAKE_PROJECT
@@ -21,24 +21,34 @@
 namespace margelo::nitro::reactnativebundlecrypto {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::reactnativebundlecrypto::registerAllNatives();
+  });
+}
+
+struct JHybridReactNativeBundleCryptoSpecImpl: public jni::JavaClass<JHybridReactNativeBundleCryptoSpecImpl, JHybridReactNativeBundleCryptoSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/reactnativebundlecrypto/ReactNativeBundleCrypto;";
+  static std::shared_ptr<JHybridReactNativeBundleCryptoSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridReactNativeBundleCryptoSpecImpl::javaobject()>();
+    jni::local_ref<JHybridReactNativeBundleCryptoSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridReactNativeBundleCryptoSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::reactnativebundlecrypto;
-  using namespace facebook;
-
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::reactnativebundlecrypto::JHybridReactNativeBundleCryptoSpec::registerNatives();
-
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ReactNativeBundleCrypto",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridReactNativeBundleCryptoSpec::javaobject> object("com/margelo/nitro/reactnativebundlecrypto/ReactNativeBundleCrypto");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+
+  // Register native JNI methods
+  margelo::nitro::reactnativebundlecrypto::JHybridReactNativeBundleCryptoSpec::CxxPart::registerNatives();
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "ReactNativeBundleCrypto",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridReactNativeBundleCryptoSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::reactnativebundlecrypto

package/nitrogen/generated/android/reactnativebundlecryptoOnLoad.hpp

@@ -2,24 +2,33 @@
 /// reactnativebundlecryptoOnLoad.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::reactnativebundlecrypto {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of reactnativebundlecrypto, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of reactnativebundlecrypto, 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::reactnativebundlecrypto::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all reactnativebundlecrypto HybridObjects
+   *     margelo::nitro::reactnativebundlecrypto::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::reactnativebundlecrypto

package/nitrogen/generated/ios/ReactNativeBundleCrypto+autolinking.rb

@@ -2,7 +2,7 @@
 # ReactNativeBundleCrypto+autolinking.rb
 # 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 Ruby script that adds all files generated by Nitrogen
@@ -52,7 +52,7 @@ def add_nitrogen_files(spec)
   spec.pod_target_xcconfig = current_pod_target_xcconfig.merge({
     # Use C++ 20
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
-    # Enables C++ <-> Swift interop (by default it's only C)
+    # Enables C++ <-> Swift interop (by default it's only ObjC)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
     # Enables stricter modular headers
     "DEFINES_MODULE" => "YES",

package/nitrogen/generated/ios/ReactNativeBundleCrypto-Swift-Cxx-Bridge.cpp

@@ -2,7 +2,7 @@
 /// ReactNativeBundleCrypto-Swift-Cxx-Bridge.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
 ///
 
 #include "ReactNativeBundleCrypto-Swift-Cxx-Bridge.hpp"

package/nitrogen/generated/ios/ReactNativeBundleCrypto-Swift-Cxx-Bridge.hpp

@@ -2,7 +2,7 @@
 /// ReactNativeBundleCrypto-Swift-Cxx-Bridge.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
 ///
 
 #pragma once
@@ -57,7 +57,7 @@ namespace margelo::nitro::reactnativebundlecrypto::bridge::swift {
     return optional.has_value();
   }
   inline std::string get_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<Promise<VerifyGpgCleartextResult>>

package/nitrogen/generated/ios/ReactNativeBundleCrypto-Swift-Cxx-Umbrella.hpp

@@ -2,7 +2,7 @@
 /// ReactNativeBundleCrypto-Swift-Cxx-Umbrella.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
 ///
 
 #pragma once

package/nitrogen/generated/ios/ReactNativeBundleCryptoAutolinking.mm

@@ -2,7 +2,7 @@
 /// ReactNativeBundleCryptoAutolinking.mm
 /// 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
 ///
 
 #import <Foundation/Foundation.h>