munim-bluetooth 0.3.26 → 0.4.0

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

@@ -0,0 +1,61 @@
+///
+/// JBluetoothPhyOption.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include "BluetoothPhyOption.hpp"
+
+namespace margelo::nitro::munimbluetooth {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ enum "BluetoothPhyOption" and the the Kotlin enum "BluetoothPhyOption".
+   */
+  struct JBluetoothPhyOption final: public jni::JavaClass<JBluetoothPhyOption> {
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/BluetoothPhyOption;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based enum to the C++ enum BluetoothPhyOption.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    BluetoothPhyOption toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldOrdinal = clazz->getField<int>("value");
+      int ordinal = this->getFieldValue(fieldOrdinal);
+      return static_cast<BluetoothPhyOption>(ordinal);
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based enum with the given C++ enum's value.
+     */
+    [[maybe_unused]]
+    static jni::alias_ref<JBluetoothPhyOption> fromCpp(BluetoothPhyOption value) {
+      static const auto clazz = javaClassStatic();
+      switch (value) {
+        case BluetoothPhyOption::NONE:
+          static const auto fieldNONE = clazz->getStaticField<JBluetoothPhyOption>("NONE");
+          return clazz->getStaticFieldValue(fieldNONE);
+        case BluetoothPhyOption::S2:
+          static const auto fieldS2 = clazz->getStaticField<JBluetoothPhyOption>("S2");
+          return clazz->getStaticFieldValue(fieldS2);
+        case BluetoothPhyOption::S8:
+          static const auto fieldS8 = clazz->getStaticField<JBluetoothPhyOption>("S8");
+          return clazz->getStaticFieldValue(fieldS8);
+        default:
+          std::string stringValue = std::to_string(static_cast<int>(value));
+          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
+      }
+    }
+  };
+
+} // namespace margelo::nitro::munimbluetooth

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

@@ -0,0 +1,64 @@
+///
+/// JBondState.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include "BondState.hpp"
+
+namespace margelo::nitro::munimbluetooth {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ enum "BondState" and the the Kotlin enum "BondState".
+   */
+  struct JBondState final: public jni::JavaClass<JBondState> {
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/BondState;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based enum to the C++ enum BondState.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    BondState toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldOrdinal = clazz->getField<int>("value");
+      int ordinal = this->getFieldValue(fieldOrdinal);
+      return static_cast<BondState>(ordinal);
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based enum with the given C++ enum's value.
+     */
+    [[maybe_unused]]
+    static jni::alias_ref<JBondState> fromCpp(BondState value) {
+      static const auto clazz = javaClassStatic();
+      switch (value) {
+        case BondState::NONE:
+          static const auto fieldNONE = clazz->getStaticField<JBondState>("NONE");
+          return clazz->getStaticFieldValue(fieldNONE);
+        case BondState::BONDING:
+          static const auto fieldBONDING = clazz->getStaticField<JBondState>("BONDING");
+          return clazz->getStaticFieldValue(fieldBONDING);
+        case BondState::BONDED:
+          static const auto fieldBONDED = clazz->getStaticField<JBondState>("BONDED");
+          return clazz->getStaticFieldValue(fieldBONDED);
+        case BondState::UNSUPPORTED:
+          static const auto fieldUNSUPPORTED = clazz->getStaticField<JBondState>("UNSUPPORTED");
+          return clazz->getStaticFieldValue(fieldUNSUPPORTED);
+        default:
+          std::string stringValue = std::to_string(static_cast<int>(value));
+          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
+      }
+    }
+  };
+
+} // namespace margelo::nitro::munimbluetooth

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

@@ -0,0 +1,69 @@
+///
+/// JDescriptorValue.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include "DescriptorValue.hpp"
+
+#include <string>
+
+namespace margelo::nitro::munimbluetooth {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ struct "DescriptorValue" and the the Kotlin data class "DescriptorValue".
+   */
+  struct JDescriptorValue final: public jni::JavaClass<JDescriptorValue> {
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/DescriptorValue;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based struct to the C++ struct DescriptorValue by copying all values to C++.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    DescriptorValue toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldValue = clazz->getField<jni::JString>("value");
+      jni::local_ref<jni::JString> value = this->getFieldValue(fieldValue);
+      static const auto fieldServiceUUID = clazz->getField<jni::JString>("serviceUUID");
+      jni::local_ref<jni::JString> serviceUUID = this->getFieldValue(fieldServiceUUID);
+      static const auto fieldCharacteristicUUID = clazz->getField<jni::JString>("characteristicUUID");
+      jni::local_ref<jni::JString> characteristicUUID = this->getFieldValue(fieldCharacteristicUUID);
+      static const auto fieldDescriptorUUID = clazz->getField<jni::JString>("descriptorUUID");
+      jni::local_ref<jni::JString> descriptorUUID = this->getFieldValue(fieldDescriptorUUID);
+      return DescriptorValue(
+        value->toStdString(),
+        serviceUUID->toStdString(),
+        characteristicUUID->toStdString(),
+        descriptorUUID->toStdString()
+      );
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
+     */
+    [[maybe_unused]]
+    static jni::local_ref<JDescriptorValue::javaobject> fromCpp(const DescriptorValue& value) {
+      using JSignature = JDescriptorValue(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
+        jni::make_jstring(value.value),
+        jni::make_jstring(value.serviceUUID),
+        jni::make_jstring(value.characteristicUUID),
+        jni::make_jstring(value.descriptorUUID)
+      );
+    }
+  };
+
+} // namespace margelo::nitro::munimbluetooth

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

@@ -0,0 +1,131 @@
+///
+/// JExtendedAdvertisingOptions.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include "ExtendedAdvertisingOptions.hpp"
+
+#include "AdvertisingDataTypes.hpp"
+#include "BluetoothPhy.hpp"
+#include "JAdvertisingDataTypes.hpp"
+#include "JBluetoothPhy.hpp"
+#include "JServiceDataEntry.hpp"
+#include "ServiceDataEntry.hpp"
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace margelo::nitro::munimbluetooth {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ struct "ExtendedAdvertisingOptions" and the the Kotlin data class "ExtendedAdvertisingOptions".
+   */
+  struct JExtendedAdvertisingOptions final: public jni::JavaClass<JExtendedAdvertisingOptions> {
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/ExtendedAdvertisingOptions;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based struct to the C++ struct ExtendedAdvertisingOptions by copying all values to C++.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    ExtendedAdvertisingOptions toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldServiceUUIDs = clazz->getField<jni::JArrayClass<jni::JString>>("serviceUUIDs");
+      jni::local_ref<jni::JArrayClass<jni::JString>> serviceUUIDs = this->getFieldValue(fieldServiceUUIDs);
+      static const auto fieldLocalName = clazz->getField<jni::JString>("localName");
+      jni::local_ref<jni::JString> localName = this->getFieldValue(fieldLocalName);
+      static const auto fieldManufacturerData = clazz->getField<jni::JString>("manufacturerData");
+      jni::local_ref<jni::JString> manufacturerData = this->getFieldValue(fieldManufacturerData);
+      static const auto fieldAdvertisingData = clazz->getField<JAdvertisingDataTypes>("advertisingData");
+      jni::local_ref<JAdvertisingDataTypes> advertisingData = this->getFieldValue(fieldAdvertisingData);
+      static const auto fieldConnectable = clazz->getField<jni::JBoolean>("connectable");
+      jni::local_ref<jni::JBoolean> connectable = this->getFieldValue(fieldConnectable);
+      static const auto fieldScannable = clazz->getField<jni::JBoolean>("scannable");
+      jni::local_ref<jni::JBoolean> scannable = this->getFieldValue(fieldScannable);
+      static const auto fieldLegacyMode = clazz->getField<jni::JBoolean>("legacyMode");
+      jni::local_ref<jni::JBoolean> legacyMode = this->getFieldValue(fieldLegacyMode);
+      static const auto fieldAnonymous = clazz->getField<jni::JBoolean>("anonymous");
+      jni::local_ref<jni::JBoolean> anonymous = this->getFieldValue(fieldAnonymous);
+      static const auto fieldIncludeTxPower = clazz->getField<jni::JBoolean>("includeTxPower");
+      jni::local_ref<jni::JBoolean> includeTxPower = this->getFieldValue(fieldIncludeTxPower);
+      static const auto fieldInterval = clazz->getField<jni::JDouble>("interval");
+      jni::local_ref<jni::JDouble> interval = this->getFieldValue(fieldInterval);
+      static const auto fieldTxPowerLevel = clazz->getField<jni::JDouble>("txPowerLevel");
+      jni::local_ref<jni::JDouble> txPowerLevel = this->getFieldValue(fieldTxPowerLevel);
+      static const auto fieldPrimaryPhy = clazz->getField<JBluetoothPhy>("primaryPhy");
+      jni::local_ref<JBluetoothPhy> primaryPhy = this->getFieldValue(fieldPrimaryPhy);
+      static const auto fieldSecondaryPhy = clazz->getField<JBluetoothPhy>("secondaryPhy");
+      jni::local_ref<JBluetoothPhy> secondaryPhy = this->getFieldValue(fieldSecondaryPhy);
+      return ExtendedAdvertisingOptions(
+        serviceUUIDs != nullptr ? std::make_optional([&](auto&& __input) {
+          size_t __size = __input->size();
+          std::vector<std::string> __vector;
+          __vector.reserve(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            auto __element = __input->getElement(__i);
+            __vector.push_back(__element->toStdString());
+          }
+          return __vector;
+        }(serviceUUIDs)) : std::nullopt,
+        localName != nullptr ? std::make_optional(localName->toStdString()) : std::nullopt,
+        manufacturerData != nullptr ? std::make_optional(manufacturerData->toStdString()) : std::nullopt,
+        advertisingData != nullptr ? std::make_optional(advertisingData->toCpp()) : std::nullopt,
+        connectable != nullptr ? std::make_optional(static_cast<bool>(connectable->value())) : std::nullopt,
+        scannable != nullptr ? std::make_optional(static_cast<bool>(scannable->value())) : std::nullopt,
+        legacyMode != nullptr ? std::make_optional(static_cast<bool>(legacyMode->value())) : std::nullopt,
+        anonymous != nullptr ? std::make_optional(static_cast<bool>(anonymous->value())) : std::nullopt,
+        includeTxPower != nullptr ? std::make_optional(static_cast<bool>(includeTxPower->value())) : std::nullopt,
+        interval != nullptr ? std::make_optional(interval->value()) : std::nullopt,
+        txPowerLevel != nullptr ? std::make_optional(txPowerLevel->value()) : std::nullopt,
+        primaryPhy != nullptr ? std::make_optional(primaryPhy->toCpp()) : std::nullopt,
+        secondaryPhy != nullptr ? std::make_optional(secondaryPhy->toCpp()) : std::nullopt
+      );
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
+     */
+    [[maybe_unused]]
+    static jni::local_ref<JExtendedAdvertisingOptions::javaobject> fromCpp(const ExtendedAdvertisingOptions& value) {
+      using JSignature = JExtendedAdvertisingOptions(jni::alias_ref<jni::JArrayClass<jni::JString>>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JAdvertisingDataTypes>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JBluetoothPhy>, jni::alias_ref<JBluetoothPhy>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
+        value.serviceUUIDs.has_value() ? [&](auto&& __input) {
+          size_t __size = __input.size();
+          jni::local_ref<jni::JArrayClass<jni::JString>> __array = jni::JArrayClass<jni::JString>::newArray(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            const auto& __element = __input[__i];
+            auto __elementJni = jni::make_jstring(__element);
+            __array->setElement(__i, *__elementJni);
+          }
+          return __array;
+        }(value.serviceUUIDs.value()) : nullptr,
+        value.localName.has_value() ? jni::make_jstring(value.localName.value()) : nullptr,
+        value.manufacturerData.has_value() ? jni::make_jstring(value.manufacturerData.value()) : nullptr,
+        value.advertisingData.has_value() ? JAdvertisingDataTypes::fromCpp(value.advertisingData.value()) : nullptr,
+        value.connectable.has_value() ? jni::JBoolean::valueOf(value.connectable.value()) : nullptr,
+        value.scannable.has_value() ? jni::JBoolean::valueOf(value.scannable.value()) : nullptr,
+        value.legacyMode.has_value() ? jni::JBoolean::valueOf(value.legacyMode.value()) : nullptr,
+        value.anonymous.has_value() ? jni::JBoolean::valueOf(value.anonymous.value()) : nullptr,
+        value.includeTxPower.has_value() ? jni::JBoolean::valueOf(value.includeTxPower.value()) : nullptr,
+        value.interval.has_value() ? jni::JDouble::valueOf(value.interval.value()) : nullptr,
+        value.txPowerLevel.has_value() ? jni::JDouble::valueOf(value.txPowerLevel.value()) : nullptr,
+        value.primaryPhy.has_value() ? JBluetoothPhy::fromCpp(value.primaryPhy.value()) : nullptr,
+        value.secondaryPhy.has_value() ? JBluetoothPhy::fromCpp(value.secondaryPhy.value()) : nullptr
+      );
+    }
+  };
+
+} // namespace margelo::nitro::munimbluetooth

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

@@ -10,6 +10,8 @@
 #include <fbjni/fbjni.h>
 #include "GATTCharacteristic.hpp"
 
+#include "GATTDescriptor.hpp"
+#include "JGATTDescriptor.hpp"
 #include <optional>
 #include <string>
 #include <vector>
@@ -39,19 +41,31 @@ namespace margelo::nitro::munimbluetooth {
       jni::local_ref<jni::JArrayClass<jni::JString>> properties = this->getFieldValue(fieldProperties);
       static const auto fieldValue = clazz->getField<jni::JString>("value");
       jni::local_ref<jni::JString> value = this->getFieldValue(fieldValue);
+      static const auto fieldDescriptors = clazz->getField<jni::JArrayClass<JGATTDescriptor>>("descriptors");
+      jni::local_ref<jni::JArrayClass<JGATTDescriptor>> descriptors = this->getFieldValue(fieldDescriptors);
       return GATTCharacteristic(
         uuid->toStdString(),
-        [&]() {
-          size_t __size = properties->size();
+        [&](auto&& __input) {
+          size_t __size = __input->size();
           std::vector<std::string> __vector;
           __vector.reserve(__size);
           for (size_t __i = 0; __i < __size; __i++) {
-            auto __element = properties->getElement(__i);
+            auto __element = __input->getElement(__i);
             __vector.push_back(__element->toStdString());
           }
           return __vector;
-        }(),
-        value != nullptr ? std::make_optional(value->toStdString()) : std::nullopt
+        }(properties),
+        value != nullptr ? std::make_optional(value->toStdString()) : std::nullopt,
+        descriptors != nullptr ? std::make_optional([&](auto&& __input) {
+          size_t __size = __input->size();
+          std::vector<GATTDescriptor> __vector;
+          __vector.reserve(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            auto __element = __input->getElement(__i);
+            __vector.push_back(__element->toCpp());
+          }
+          return __vector;
+        }(descriptors)) : std::nullopt
       );
     }
 
@@ -61,23 +75,33 @@ namespace margelo::nitro::munimbluetooth {
      */
     [[maybe_unused]]
     static jni::local_ref<JGATTCharacteristic::javaobject> fromCpp(const GATTCharacteristic& value) {
-      using JSignature = JGATTCharacteristic(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<jni::JString>>, jni::alias_ref<jni::JString>);
+      using JSignature = JGATTCharacteristic(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<jni::JString>>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<JGATTDescriptor>>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
         clazz,
         jni::make_jstring(value.uuid),
-        [&]() {
-          size_t __size = value.properties.size();
+        [&](auto&& __input) {
+          size_t __size = __input.size();
           jni::local_ref<jni::JArrayClass<jni::JString>> __array = jni::JArrayClass<jni::JString>::newArray(__size);
           for (size_t __i = 0; __i < __size; __i++) {
-            const auto& __element = value.properties[__i];
+            const auto& __element = __input[__i];
             auto __elementJni = jni::make_jstring(__element);
             __array->setElement(__i, *__elementJni);
           }
           return __array;
-        }(),
-        value.value.has_value() ? jni::make_jstring(value.value.value()) : nullptr
+        }(value.properties),
+        value.value.has_value() ? jni::make_jstring(value.value.value()) : nullptr,
+        value.descriptors.has_value() ? [&](auto&& __input) {
+          size_t __size = __input.size();
+          jni::local_ref<jni::JArrayClass<JGATTDescriptor>> __array = jni::JArrayClass<JGATTDescriptor>::newArray(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            const auto& __element = __input[__i];
+            auto __elementJni = JGATTDescriptor::fromCpp(__element);
+            __array->setElement(__i, *__elementJni);
+          }
+          return __array;
+        }(value.descriptors.value()) : nullptr
       );
     }
   };

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

@@ -0,0 +1,85 @@
+///
+/// JGATTDescriptor.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include "GATTDescriptor.hpp"
+
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace margelo::nitro::munimbluetooth {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ struct "GATTDescriptor" and the the Kotlin data class "GATTDescriptor".
+   */
+  struct JGATTDescriptor final: public jni::JavaClass<JGATTDescriptor> {
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/GATTDescriptor;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based struct to the C++ struct GATTDescriptor by copying all values to C++.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    GATTDescriptor toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldUuid = clazz->getField<jni::JString>("uuid");
+      jni::local_ref<jni::JString> uuid = this->getFieldValue(fieldUuid);
+      static const auto fieldValue = clazz->getField<jni::JString>("value");
+      jni::local_ref<jni::JString> value = this->getFieldValue(fieldValue);
+      static const auto fieldPermissions = clazz->getField<jni::JArrayClass<jni::JString>>("permissions");
+      jni::local_ref<jni::JArrayClass<jni::JString>> permissions = this->getFieldValue(fieldPermissions);
+      return GATTDescriptor(
+        uuid->toStdString(),
+        value != nullptr ? std::make_optional(value->toStdString()) : std::nullopt,
+        permissions != nullptr ? std::make_optional([&](auto&& __input) {
+          size_t __size = __input->size();
+          std::vector<std::string> __vector;
+          __vector.reserve(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            auto __element = __input->getElement(__i);
+            __vector.push_back(__element->toStdString());
+          }
+          return __vector;
+        }(permissions)) : std::nullopt
+      );
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
+     */
+    [[maybe_unused]]
+    static jni::local_ref<JGATTDescriptor::javaobject> fromCpp(const GATTDescriptor& value) {
+      using JSignature = JGATTDescriptor(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<jni::JString>>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
+        jni::make_jstring(value.uuid),
+        value.value.has_value() ? jni::make_jstring(value.value.value()) : nullptr,
+        value.permissions.has_value() ? [&](auto&& __input) {
+          size_t __size = __input.size();
+          jni::local_ref<jni::JArrayClass<jni::JString>> __array = jni::JArrayClass<jni::JString>::newArray(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            const auto& __element = __input[__i];
+            auto __elementJni = jni::make_jstring(__element);
+            __array->setElement(__i, *__elementJni);
+          }
+          return __array;
+        }(value.permissions.value()) : nullptr
+      );
+    }
+  };
+
+} // namespace margelo::nitro::munimbluetooth

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

@@ -11,7 +11,9 @@
 #include "GATTService.hpp"
 
 #include "GATTCharacteristic.hpp"
+#include "GATTDescriptor.hpp"
 #include "JGATTCharacteristic.hpp"
+#include "JGATTDescriptor.hpp"
 #include <optional>
 #include <string>
 #include <vector>
@@ -39,18 +41,30 @@ namespace margelo::nitro::munimbluetooth {
       jni::local_ref<jni::JString> uuid = this->getFieldValue(fieldUuid);
       static const auto fieldCharacteristics = clazz->getField<jni::JArrayClass<JGATTCharacteristic>>("characteristics");
       jni::local_ref<jni::JArrayClass<JGATTCharacteristic>> characteristics = this->getFieldValue(fieldCharacteristics);
+      static const auto fieldIncludedServices = clazz->getField<jni::JArrayClass<jni::JString>>("includedServices");
+      jni::local_ref<jni::JArrayClass<jni::JString>> includedServices = this->getFieldValue(fieldIncludedServices);
       return GATTService(
         uuid->toStdString(),
-        [&]() {
-          size_t __size = characteristics->size();
+        [&](auto&& __input) {
+          size_t __size = __input->size();
           std::vector<GATTCharacteristic> __vector;
           __vector.reserve(__size);
           for (size_t __i = 0; __i < __size; __i++) {
-            auto __element = characteristics->getElement(__i);
+            auto __element = __input->getElement(__i);
             __vector.push_back(__element->toCpp());
           }
           return __vector;
-        }()
+        }(characteristics),
+        includedServices != nullptr ? std::make_optional([&](auto&& __input) {
+          size_t __size = __input->size();
+          std::vector<std::string> __vector;
+          __vector.reserve(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            auto __element = __input->getElement(__i);
+            __vector.push_back(__element->toStdString());
+          }
+          return __vector;
+        }(includedServices)) : std::nullopt
       );
     }
 
@@ -60,22 +74,32 @@ namespace margelo::nitro::munimbluetooth {
      */
     [[maybe_unused]]
     static jni::local_ref<JGATTService::javaobject> fromCpp(const GATTService& value) {
-      using JSignature = JGATTService(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<JGATTCharacteristic>>);
+      using JSignature = JGATTService(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<JGATTCharacteristic>>, jni::alias_ref<jni::JArrayClass<jni::JString>>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
         clazz,
         jni::make_jstring(value.uuid),
-        [&]() {
-          size_t __size = value.characteristics.size();
+        [&](auto&& __input) {
+          size_t __size = __input.size();
           jni::local_ref<jni::JArrayClass<JGATTCharacteristic>> __array = jni::JArrayClass<JGATTCharacteristic>::newArray(__size);
           for (size_t __i = 0; __i < __size; __i++) {
-            const auto& __element = value.characteristics[__i];
+            const auto& __element = __input[__i];
             auto __elementJni = JGATTCharacteristic::fromCpp(__element);
             __array->setElement(__i, *__elementJni);
           }
           return __array;
-        }()
+        }(value.characteristics),
+        value.includedServices.has_value() ? [&](auto&& __input) {
+          size_t __size = __input.size();
+          jni::local_ref<jni::JArrayClass<jni::JString>> __array = jni::JArrayClass<jni::JString>::newArray(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            const auto& __element = __input[__i];
+            auto __elementJni = jni::make_jstring(__element);
+            __array->setElement(__i, *__elementJni);
+          }
+          return __array;
+        }(value.includedServices.value()) : nullptr
       );
     }
   };