@onekeyfe/react-native-keychain-module 3.0.81 → 3.0.85

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

@@ -2,7 +2,7 @@
 /// JGetItemParams.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::keychainmodule {
    */
   struct JGetItemParams final: public jni::JavaClass<JGetItemParams> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/GetItemParams;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/GetItemParams;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JGetItemResult.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::keychainmodule {
    */
   struct JGetItemResult final: public jni::JavaClass<JGetItemResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/GetItemResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/GetItemResult;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JHasItemParams.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::keychainmodule {
    */
   struct JHasItemParams final: public jni::JavaClass<JHasItemParams> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/HasItemParams;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/HasItemParams;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JHybridKeychainModuleSpec.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 "JHybridKeychainModuleSpec.hpp"
@@ -20,6 +20,7 @@ namespace margelo::nitro::keychainmodule { struct HasItemParams; }
 
 #include <NitroModules/Promise.hpp>
 #include <NitroModules/JPromise.hpp>
+#include <NitroModules/JUnit.hpp>
 #include <NitroModules/Null.hpp>
 #include "GetItemResult.hpp"
 #include <variant>
@@ -39,30 +40,31 @@ namespace margelo::nitro::keychainmodule { struct HasItemParams; }
 
 namespace margelo::nitro::keychainmodule {
 
-  jni::local_ref<JHybridKeychainModuleSpec::jhybriddata> JHybridKeychainModuleSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridKeychainModuleSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridKeychainModuleSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridKeychainModuleSpec> JHybridKeychainModuleSpec::JavaPart::getJHybridKeychainModuleSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridKeychainModuleSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridKeychainModuleSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridKeychainModuleSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridKeychainModuleSpec::CxxPart::jhybriddata> JHybridKeychainModuleSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  void JHybridKeychainModuleSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+  std::shared_ptr<JHybridObject> JHybridKeychainModuleSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridKeychainModuleSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridKeychainModuleSpec::JavaPart!");
+    }
+    return std::make_shared<JHybridKeychainModuleSpec>(castJavaPart);
   }
 
-  std::string JHybridKeychainModuleSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridKeychainModuleSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridKeychainModuleSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -70,7 +72,7 @@ namespace margelo::nitro::keychainmodule {
 
   // Methods
   std::shared_ptr<Promise<void>> JHybridKeychainModuleSpec::setItem(const SetItemParams& params) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JSetItemParams> /* params */)>("setItem");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JSetItemParams> /* params */)>("setItem");
     auto __result = method(_javaPart, JSetItemParams::fromCpp(params));
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -85,7 +87,7 @@ namespace margelo::nitro::keychainmodule {
     }();
   }
   std::shared_ptr<Promise<std::variant<nitro::NullType, GetItemResult>>> JHybridKeychainModuleSpec::getItem(const GetItemParams& params) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JGetItemParams> /* params */)>("getItem");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JGetItemParams> /* params */)>("getItem");
     auto __result = method(_javaPart, JGetItemParams::fromCpp(params));
     return [&]() {
       auto __promise = Promise<std::variant<nitro::NullType, GetItemResult>>::create();
@@ -101,7 +103,7 @@ namespace margelo::nitro::keychainmodule {
     }();
   }
   std::shared_ptr<Promise<void>> JHybridKeychainModuleSpec::removeItem(const RemoveItemParams& params) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JRemoveItemParams> /* params */)>("removeItem");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JRemoveItemParams> /* params */)>("removeItem");
     auto __result = method(_javaPart, JRemoveItemParams::fromCpp(params));
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -116,7 +118,7 @@ namespace margelo::nitro::keychainmodule {
     }();
   }
   std::shared_ptr<Promise<bool>> JHybridKeychainModuleSpec::hasItem(const HasItemParams& params) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JHasItemParams> /* params */)>("hasItem");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JHasItemParams> /* params */)>("hasItem");
     auto __result = method(_javaPart, JHasItemParams::fromCpp(params));
     return [&]() {
       auto __promise = Promise<bool>::create();
@@ -132,7 +134,7 @@ namespace margelo::nitro::keychainmodule {
     }();
   }
   std::shared_ptr<Promise<bool>> JHybridKeychainModuleSpec::isICloudSyncEnabled() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("isICloudSyncEnabled");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("isICloudSyncEnabled");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<bool>::create();

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

@@ -2,7 +2,7 @@
 /// HybridKeychainModuleSpec.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::keychainmodule {
 
   using namespace facebook;
 
-  class JHybridKeychainModuleSpec: public jni::HybridClass<JHybridKeychainModuleSpec, JHybridObject>,
-                                   public virtual HybridKeychainModuleSpec {
+  class JHybridKeychainModuleSpec: public virtual HybridKeychainModuleSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/HybridKeychainModuleSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridKeychainModuleSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridKeychainModuleSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/HybridKeychainModuleSpec;";
+      std::shared_ptr<JHybridKeychainModuleSpec> getJHybridKeychainModuleSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/HybridKeychainModuleSpec$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 JHybridKeychainModuleSpec(const jni::local_ref<JHybridKeychainModuleSpec::JavaPart>& javaPart):
+      HybridObject(HybridKeychainModuleSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridKeychainModuleSpec() 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<JHybridKeychainModuleSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridKeychainModuleSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -61,9 +61,7 @@ namespace margelo::nitro::keychainmodule {
     std::shared_ptr<Promise<bool>> isICloudSyncEnabled() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridKeychainModuleSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridKeychainModuleSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::keychainmodule

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

@@ -2,7 +2,7 @@
 /// JRemoveItemParams.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::keychainmodule {
    */
   struct JRemoveItemParams final: public jni::JavaClass<JRemoveItemParams> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/RemoveItemParams;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/RemoveItemParams;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JSetItemParams.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::keychainmodule {
    */
   struct JSetItemParams final: public jni::JavaClass<JSetItemParams> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/SetItemParams;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/SetItemParams;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JVariant_NullType_GetItemResult.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 "JVariant_NullType_GetItemResult.hpp"

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

@@ -2,7 +2,7 @@
 /// JVariant_NullType_GetItemResult.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
@@ -26,7 +26,7 @@ namespace margelo::nitro::keychainmodule {
    */
   class JVariant_NullType_GetItemResult: public jni::JavaClass<JVariant_NullType_GetItemResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/Variant_NullType_GetItemResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/Variant_NullType_GetItemResult;";
 
     static jni::local_ref<JVariant_NullType_GetItemResult> create_0(jni::alias_ref<JNull> value) {
       static const auto method = javaClassStatic()->getStaticMethod<JVariant_NullType_GetItemResult(jni::alias_ref<JNull>)>("create");
@@ -49,9 +49,9 @@ namespace margelo::nitro::keychainmodule {
   };
 
   namespace JVariant_NullType_GetItemResult_impl {
-    class First: public jni::JavaClass<First, JVariant_NullType_GetItemResult> {
+    class First final: public jni::JavaClass<First, JVariant_NullType_GetItemResult> {
     public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/Variant_NullType_GetItemResult$First;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/Variant_NullType_GetItemResult$First;";
     
       [[nodiscard]] jni::local_ref<JNull> getValue() const {
         static const auto field = javaClassStatic()->getField<JNull>("value");
@@ -59,9 +59,9 @@ namespace margelo::nitro::keychainmodule {
       }
     };
     
-    class Second: public jni::JavaClass<Second, JVariant_NullType_GetItemResult> {
+    class Second final: public jni::JavaClass<Second, JVariant_NullType_GetItemResult> {
     public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/Variant_NullType_GetItemResult$Second;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/keychainmodule/Variant_NullType_GetItemResult$Second;";
     
       [[nodiscard]] jni::local_ref<JGetItemResult> getValue() const {
         static const auto field = javaClassStatic()->getField<JGetItemResult>("value");

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

@@ -2,7 +2,7 @@
 # keychainmodule+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/keychainmodule+autolinking.gradle

@@ -2,7 +2,7 @@
 /// keychainmodule+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/keychainmoduleOnLoad.cpp

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

package/nitrogen/generated/android/keychainmoduleOnLoad.hpp

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

package/nitrogen/generated/android/kotlin/com/margelo/nitro/keychainmodule/GetItemParams.kt

@@ -2,7 +2,7 @@
 /// GetItemParams.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.keychainmodule
@@ -23,7 +23,7 @@ data class GetItemParams(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/keychainmodule/GetItemResult.kt

@@ -2,7 +2,7 @@
 /// GetItemResult.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.keychainmodule
@@ -26,7 +26,7 @@ data class GetItemResult(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/keychainmodule/HasItemParams.kt

@@ -2,7 +2,7 @@
 /// HasItemParams.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.keychainmodule
@@ -23,7 +23,7 @@ data class HasItemParams(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/keychainmodule/HybridKeychainModuleSpec.kt

@@ -2,7 +2,7 @@
 /// HybridKeychainModuleSpec.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.keychainmodule
@@ -26,23 +26,6 @@ import com.margelo.nitro.core.HybridObject
   "LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
 )
 abstract class HybridKeychainModuleSpec: 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 KeychainModule]"
-  }
-
   // Properties
   
 
@@ -67,7 +50,21 @@ abstract class HybridKeychainModuleSpec: HybridObject() {
   @Keep
   abstract fun isICloudSyncEnabled(): Promise<Boolean>
 
-  private external fun initHybrid(): HybridData
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject KeychainModule]"
+  }
+
+  // C++ backing class
+  @DoNotStrip
+  @Keep
+  protected open class CxxPart(javaPart: HybridKeychainModuleSpec): HybridObject.CxxPart(javaPart) {
+    // C++ JHybridKeychainModuleSpec::CxxPart::initHybrid(...)
+    external override fun initHybrid(): HybridData
+  }
+  override fun createCxxPart(): CxxPart {
+    return CxxPart(this)
+  }
 
   companion object {
     protected const val TAG = "HybridKeychainModuleSpec"

package/nitrogen/generated/android/kotlin/com/margelo/nitro/keychainmodule/RemoveItemParams.kt

@@ -2,7 +2,7 @@
 /// RemoveItemParams.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.keychainmodule
@@ -23,7 +23,7 @@ data class RemoveItemParams(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/keychainmodule/SetItemParams.kt

@@ -2,7 +2,7 @@
 /// SetItemParams.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.keychainmodule
@@ -35,7 +35,7 @@ data class SetItemParams(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/keychainmodule/Variant_NullType_GetItemResult.kt

@@ -2,7 +2,7 @@
 /// Variant_NullType_GetItemResult.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.keychainmodule
@@ -21,12 +21,6 @@ sealed class Variant_NullType_GetItemResult {
   @DoNotStrip
   data class Second(@DoNotStrip val value: GetItemResult): Variant_NullType_GetItemResult()
 
-  @Deprecated("getAs() is not type-safe. Use fold/asFirstOrNull/asSecondOrNull instead.", level = DeprecationLevel.ERROR)
-  inline fun <reified T> getAs(): T? = when (this) {
-    is First -> value as? T
-    is Second -> value as? T
-  }
-
   val isFirst: Boolean
     get() = this is First
   val isSecond: Boolean

package/nitrogen/generated/android/kotlin/com/margelo/nitro/keychainmodule/keychainmoduleOnLoad.kt

@@ -2,7 +2,7 @@
 /// keychainmoduleOnLoad.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.keychainmodule

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

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