react-native-nitro-geolocation 1.0.0 → 1.1.0

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

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

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

@@ -2,7 +2,7 @@
 /// JAuthorizationLevel.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JAuthorizationLevelInternal.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JFunc_void.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JFunc_void_GeolocationError.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JFunc_void_GeolocationResponse.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JFunc_void_LocationError.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JGeolocationCoordinates.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JGeolocationError.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JGeolocationOptions.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JGeolocationResponse.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JHybridNitroGeolocationCompatSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridNitroGeolocationCompatSpec.hpp"
@@ -50,30 +50,31 @@ namespace margelo::nitro::nitrogeolocation { struct GeolocationOptions; }
 
 namespace margelo::nitro::nitrogeolocation {
 
-  jni::local_ref<JHybridNitroGeolocationCompatSpec::jhybriddata> JHybridNitroGeolocationCompatSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridNitroGeolocationCompatSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridNitroGeolocationCompatSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridNitroGeolocationCompatSpec> JHybridNitroGeolocationCompatSpec::JavaPart::getJHybridNitroGeolocationCompatSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridNitroGeolocationCompatSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridNitroGeolocationCompatSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridNitroGeolocationCompatSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridNitroGeolocationCompatSpec::CxxPart::jhybriddata> JHybridNitroGeolocationCompatSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  void JHybridNitroGeolocationCompatSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+  std::shared_ptr<JHybridObject> JHybridNitroGeolocationCompatSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridNitroGeolocationCompatSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridNitroGeolocationCompatSpec::JavaPart!");
+    }
+    return std::make_shared<JHybridNitroGeolocationCompatSpec>(castJavaPart);
   }
 
-  std::string JHybridNitroGeolocationCompatSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridNitroGeolocationCompatSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridNitroGeolocationCompatSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -81,28 +82,28 @@ namespace margelo::nitro::nitrogeolocation {
 
   // Methods
   void JHybridNitroGeolocationCompatSpec::setRNConfiguration(const RNConfigurationInternal& config) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JRNConfigurationInternal> /* config */)>("setRNConfiguration");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JRNConfigurationInternal> /* config */)>("setRNConfiguration");
     method(_javaPart, JRNConfigurationInternal::fromCpp(config));
   }
   void JHybridNitroGeolocationCompatSpec::requestAuthorization(const std::optional<std::function<void()>>& success, const std::optional<std::function<void(const GeolocationError& /* error */)>>& error) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void::javaobject> /* success */, jni::alias_ref<JFunc_void_GeolocationError::javaobject> /* error */)>("requestAuthorization_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void::javaobject> /* success */, jni::alias_ref<JFunc_void_GeolocationError::javaobject> /* error */)>("requestAuthorization_cxx");
     method(_javaPart, success.has_value() ? JFunc_void_cxx::fromCpp(success.value()) : nullptr, error.has_value() ? JFunc_void_GeolocationError_cxx::fromCpp(error.value()) : nullptr);
   }
   void JHybridNitroGeolocationCompatSpec::getCurrentPosition(const std::function<void(const GeolocationResponse& /* position */)>& success, const std::optional<std::function<void(const GeolocationError& /* error */)>>& error, const std::optional<GeolocationOptions>& options) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_GeolocationResponse::javaobject> /* success */, jni::alias_ref<JFunc_void_GeolocationError::javaobject> /* error */, jni::alias_ref<JGeolocationOptions> /* options */)>("getCurrentPosition_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_GeolocationResponse::javaobject> /* success */, jni::alias_ref<JFunc_void_GeolocationError::javaobject> /* error */, jni::alias_ref<JGeolocationOptions> /* options */)>("getCurrentPosition_cxx");
     method(_javaPart, JFunc_void_GeolocationResponse_cxx::fromCpp(success), error.has_value() ? JFunc_void_GeolocationError_cxx::fromCpp(error.value()) : nullptr, options.has_value() ? JGeolocationOptions::fromCpp(options.value()) : nullptr);
   }
   double JHybridNitroGeolocationCompatSpec::watchPosition(const std::function<void(const GeolocationResponse& /* position */)>& success, const std::optional<std::function<void(const GeolocationError& /* error */)>>& error, const std::optional<GeolocationOptions>& options) {
-    static const auto method = javaClassStatic()->getMethod<double(jni::alias_ref<JFunc_void_GeolocationResponse::javaobject> /* success */, jni::alias_ref<JFunc_void_GeolocationError::javaobject> /* error */, jni::alias_ref<JGeolocationOptions> /* options */)>("watchPosition_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<double(jni::alias_ref<JFunc_void_GeolocationResponse::javaobject> /* success */, jni::alias_ref<JFunc_void_GeolocationError::javaobject> /* error */, jni::alias_ref<JGeolocationOptions> /* options */)>("watchPosition_cxx");
     auto __result = method(_javaPart, JFunc_void_GeolocationResponse_cxx::fromCpp(success), error.has_value() ? JFunc_void_GeolocationError_cxx::fromCpp(error.value()) : nullptr, options.has_value() ? JGeolocationOptions::fromCpp(options.value()) : nullptr);
     return __result;
   }
   void JHybridNitroGeolocationCompatSpec::clearWatch(double watchId) {
-    static const auto method = javaClassStatic()->getMethod<void(double /* watchId */)>("clearWatch");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(double /* watchId */)>("clearWatch");
     method(_javaPart, watchId);
   }
   void JHybridNitroGeolocationCompatSpec::stopObserving() {
-    static const auto method = javaClassStatic()->getMethod<void()>("stopObserving");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("stopObserving");
     method(_javaPart);
   }
 

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

@@ -2,7 +2,7 @@
 /// HybridNitroGeolocationCompatSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -18,33 +18,33 @@ namespace margelo::nitro::nitrogeolocation {
 
   using namespace facebook;
 
-  class JHybridNitroGeolocationCompatSpec: public jni::HybridClass<JHybridNitroGeolocationCompatSpec, JHybridObject>,
-                                           public virtual HybridNitroGeolocationCompatSpec {
+  class JHybridNitroGeolocationCompatSpec: public virtual HybridNitroGeolocationCompatSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrogeolocation/HybridNitroGeolocationCompatSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridNitroGeolocationCompatSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridNitroGeolocationCompatSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrogeolocation/HybridNitroGeolocationCompatSpec;";
+      std::shared_ptr<JHybridNitroGeolocationCompatSpec> getJHybridNitroGeolocationCompatSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrogeolocation/HybridNitroGeolocationCompatSpec$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 JHybridNitroGeolocationCompatSpec(const jni::local_ref<JHybridNitroGeolocationCompatSpec::JavaPart>& javaPart):
+      HybridObject(HybridNitroGeolocationCompatSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridNitroGeolocationCompatSpec() 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<JHybridNitroGeolocationCompatSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridNitroGeolocationCompatSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -62,9 +62,7 @@ namespace margelo::nitro::nitrogeolocation {
     void stopObserving() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridNitroGeolocationCompatSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridNitroGeolocationCompatSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::nitrogeolocation

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

@@ -2,7 +2,7 @@
 /// JHybridNitroGeolocationSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridNitroGeolocationSpec.hpp"
@@ -55,30 +55,31 @@ namespace margelo::nitro::nitrogeolocation { struct LocationError; }
 
 namespace margelo::nitro::nitrogeolocation {
 
-  jni::local_ref<JHybridNitroGeolocationSpec::jhybriddata> JHybridNitroGeolocationSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridNitroGeolocationSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridNitroGeolocationSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridNitroGeolocationSpec> JHybridNitroGeolocationSpec::JavaPart::getJHybridNitroGeolocationSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridNitroGeolocationSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridNitroGeolocationSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridNitroGeolocationSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridNitroGeolocationSpec::CxxPart::jhybriddata> JHybridNitroGeolocationSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  void JHybridNitroGeolocationSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+  std::shared_ptr<JHybridObject> JHybridNitroGeolocationSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridNitroGeolocationSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridNitroGeolocationSpec::JavaPart!");
+    }
+    return std::make_shared<JHybridNitroGeolocationSpec>(castJavaPart);
   }
 
-  std::string JHybridNitroGeolocationSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridNitroGeolocationSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridNitroGeolocationSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -86,11 +87,11 @@ namespace margelo::nitro::nitrogeolocation {
 
   // Methods
   void JHybridNitroGeolocationSpec::setConfiguration(const ModernGeolocationConfiguration& config) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JModernGeolocationConfiguration> /* config */)>("setConfiguration");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JModernGeolocationConfiguration> /* config */)>("setConfiguration");
     method(_javaPart, JModernGeolocationConfiguration::fromCpp(config));
   }
   std::shared_ptr<Promise<PermissionStatus>> JHybridNitroGeolocationSpec::checkPermission() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("checkPermission");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("checkPermission");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<PermissionStatus>::create();
@@ -106,7 +107,7 @@ namespace margelo::nitro::nitrogeolocation {
     }();
   }
   std::shared_ptr<Promise<PermissionStatus>> JHybridNitroGeolocationSpec::requestPermission() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("requestPermission");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("requestPermission");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<PermissionStatus>::create();
@@ -122,7 +123,7 @@ namespace margelo::nitro::nitrogeolocation {
     }();
   }
   std::shared_ptr<Promise<GeolocationResponse>> JHybridNitroGeolocationSpec::getCurrentPosition(const std::optional<LocationRequestOptions>& options) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JLocationRequestOptions> /* options */)>("getCurrentPosition");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JLocationRequestOptions> /* options */)>("getCurrentPosition");
     auto __result = method(_javaPart, options.has_value() ? JLocationRequestOptions::fromCpp(options.value()) : nullptr);
     return [&]() {
       auto __promise = Promise<GeolocationResponse>::create();
@@ -138,16 +139,16 @@ namespace margelo::nitro::nitrogeolocation {
     }();
   }
   std::string JHybridNitroGeolocationSpec::watchPosition(const std::function<void(const GeolocationResponse& /* position */)>& success, const std::optional<std::function<void(const LocationError& /* error */)>>& error, const std::optional<LocationRequestOptions>& options) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>(jni::alias_ref<JFunc_void_GeolocationResponse::javaobject> /* success */, jni::alias_ref<JFunc_void_LocationError::javaobject> /* error */, jni::alias_ref<JLocationRequestOptions> /* options */)>("watchPosition_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>(jni::alias_ref<JFunc_void_GeolocationResponse::javaobject> /* success */, jni::alias_ref<JFunc_void_LocationError::javaobject> /* error */, jni::alias_ref<JLocationRequestOptions> /* options */)>("watchPosition_cxx");
     auto __result = method(_javaPart, JFunc_void_GeolocationResponse_cxx::fromCpp(success), error.has_value() ? JFunc_void_LocationError_cxx::fromCpp(error.value()) : nullptr, options.has_value() ? JLocationRequestOptions::fromCpp(options.value()) : nullptr);
     return __result->toStdString();
   }
   void JHybridNitroGeolocationSpec::unwatch(const std::string& token) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* token */)>("unwatch");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* token */)>("unwatch");
     method(_javaPart, jni::make_jstring(token));
   }
   void JHybridNitroGeolocationSpec::stopObserving() {
-    static const auto method = javaClassStatic()->getMethod<void()>("stopObserving");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("stopObserving");
     method(_javaPart);
   }
 

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

@@ -2,7 +2,7 @@
 /// HybridNitroGeolocationSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -18,33 +18,33 @@ namespace margelo::nitro::nitrogeolocation {
 
   using namespace facebook;
 
-  class JHybridNitroGeolocationSpec: public jni::HybridClass<JHybridNitroGeolocationSpec, JHybridObject>,
-                                     public virtual HybridNitroGeolocationSpec {
+  class JHybridNitroGeolocationSpec: public virtual HybridNitroGeolocationSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrogeolocation/HybridNitroGeolocationSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridNitroGeolocationSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridNitroGeolocationSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrogeolocation/HybridNitroGeolocationSpec;";
+      std::shared_ptr<JHybridNitroGeolocationSpec> getJHybridNitroGeolocationSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrogeolocation/HybridNitroGeolocationSpec$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 JHybridNitroGeolocationSpec(const jni::local_ref<JHybridNitroGeolocationSpec::JavaPart>& javaPart):
+      HybridObject(HybridNitroGeolocationSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridNitroGeolocationSpec() 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<JHybridNitroGeolocationSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridNitroGeolocationSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -63,9 +63,7 @@ namespace margelo::nitro::nitrogeolocation {
     void stopObserving() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridNitroGeolocationSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridNitroGeolocationSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::nitrogeolocation

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

@@ -2,7 +2,7 @@
 /// JLocationError.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JLocationProvider.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JLocationProviderInternal.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JLocationRequestOptions.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JModernGeolocationConfiguration.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JNullableDouble.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JNullableDouble.hpp"

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

@@ -2,7 +2,7 @@
 /// JNullableDouble.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JPermissionStatus.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

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

@@ -2,7 +2,7 @@
 /// JRNConfigurationInternal.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrogeolocation/AuthorizationLevel.kt

@@ -2,7 +2,7 @@
 /// AuthorizationLevel.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.nitrogeolocation

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrogeolocation/AuthorizationLevelInternal.kt

@@ -2,7 +2,7 @@
 /// AuthorizationLevelInternal.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.nitrogeolocation

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrogeolocation/Func_void.kt

@@ -2,7 +2,7 @@
 /// Func_void.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.nitrogeolocation

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrogeolocation/Func_void_GeolocationError.kt

@@ -2,7 +2,7 @@
 /// Func_void_GeolocationError.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.nitrogeolocation

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrogeolocation/Func_void_GeolocationResponse.kt

@@ -2,7 +2,7 @@
 /// Func_void_GeolocationResponse.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.nitrogeolocation

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrogeolocation/Func_void_LocationError.kt

@@ -2,7 +2,7 @@
 /// Func_void_LocationError.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.nitrogeolocation