react-native-iap 15.4.0-rc.3 → 15.4.1

package/src/utils/error.ts

@@ -110,11 +110,11 @@ const parseNSErrorJsonPayload = (rawString: string): IapError | null => {
   return null;
 };
 
-const parseStructuredError = (error: Error): IapError | null => {
-  const errorWithCode = error as Error & {code?: unknown} & Record<
-      string,
-      unknown
-    >;
+const parseStructuredError = (error: object): IapError | null => {
+  const errorWithCode = error as {code?: unknown; message?: unknown} & Record<
+    string,
+    unknown
+  >;
 
   if (errorWithCode.code != null) {
     const {code, message, ...extraFields} = errorWithCode;
@@ -122,7 +122,7 @@ const parseStructuredError = (error: Error): IapError | null => {
     return {
       ...extraFields,
       code: String(code),
-      message: typeof message === 'string' ? message : error.message,
+      message: typeof message === 'string' ? message : 'Unknown error occurred',
     };
   }
 
@@ -143,13 +143,16 @@ const parseStructuredError = (error: Error): IapError | null => {
 export function parseErrorStringToJsonObj(
   errorString: string | Error | unknown,
 ): IapError {
-  // Handle Error objects
-  if (errorString instanceof Error) {
+  // Nitro can reject with either Error instances or plain structured objects.
+  if (typeof errorString === 'object' && errorString !== null) {
     const structuredError = parseStructuredError(errorString);
     if (structuredError) {
       return structuredError;
     }
+  }
 
+  // Parse an Error's message after checking for attached structured fields.
+  if (errorString instanceof Error) {
     errorString = errorString.message;
   }
 

package/src/utils/errorMapping.ts

@@ -4,7 +4,11 @@
  * and constructing structured purchase errors.
  */
 
-import {ErrorCode, type IapPlatform} from '../types';
+import {
+  ErrorCode,
+  type IapPlatform,
+  type SubResponseCodeAndroid,
+} from '../types';
 
 /**
  * Error code for duplicate purchase events detected on iOS.
@@ -54,6 +58,7 @@ export interface PurchaseErrorProps {
   productIds?: string[];
   productType?: string;
   isEmptyProductList?: boolean;
+  subResponseCodeAndroid?: SubResponseCodeAndroid;
   platform?: IapPlatform;
 }
 
@@ -65,6 +70,7 @@ export interface PurchaseError extends Error {
   productIds?: string[];
   productType?: string;
   isEmptyProductList?: boolean;
+  subResponseCodeAndroid?: SubResponseCodeAndroid;
   platform?: IapPlatform;
 }
 
@@ -146,6 +152,7 @@ export const createPurchaseError = (
   error.productIds = props.productIds;
   error.productType = props.productType;
   error.isEmptyProductList = props.isEmptyProductList;
+  error.subResponseCodeAndroid = props.subResponseCodeAndroid;
   error.platform = props.platform;
   return error;
 };
@@ -170,6 +177,7 @@ export const createPurchaseErrorFromPlatform = (
     productIds: errorData.productIds,
     productType: errorData.productType,
     isEmptyProductList: errorData.isEmptyProductList,
+    subResponseCodeAndroid: errorData.subResponseCodeAndroid,
     platform,
   });
 };

package/src/utils/type-bridge.ts

@@ -8,6 +8,7 @@
 import type {
   NitroProduct,
   NitroPurchase,
+  NitroRenewalInfoIOS,
   NitroSubscriptionStatus,
 } from '../specs/RnIap.nitro';
 import type {
@@ -25,6 +26,7 @@ import type {
   Purchase,
   PurchaseAndroid,
   PurchaseIOS,
+  RenewalInfoIOS,
   SubscriptionStatusIOS,
 } from '../types';
 import {RnIapConsole} from './debug';
@@ -191,6 +193,30 @@ function toNullableBoolean(value: unknown): boolean | null {
   return null;
 }
 
+function convertNitroRenewalInfoToRenewalInfoIOS(
+  renewalInfo: NitroRenewalInfoIOS,
+): RenewalInfoIOS {
+  return {
+    autoRenewPreference: toNullableString(renewalInfo.autoRenewPreference),
+    commitmentInfo: renewalInfo.commitmentInfo ?? null,
+    expirationReason: toNullableString(renewalInfo.expirationReason),
+    gracePeriodExpirationDate: toNullableNumber(
+      renewalInfo.gracePeriodExpirationDate,
+    ),
+    isInBillingRetry: toNullableBoolean(renewalInfo.isInBillingRetry),
+    jsonRepresentation: toNullableString(renewalInfo.jsonRepresentation),
+    pendingUpgradeProductId: toNullableString(
+      renewalInfo.pendingUpgradeProductId,
+    ),
+    priceIncreaseStatus: toNullableString(renewalInfo.priceIncreaseStatus),
+    renewalBillingPlanType: renewalInfo.renewalBillingPlanType ?? null,
+    renewalDate: toNullableNumber(renewalInfo.renewalDate),
+    renewalOfferId: toNullableString(renewalInfo.renewalOfferId),
+    renewalOfferType: toNullableString(renewalInfo.renewalOfferType),
+    willAutoRenew: renewalInfo.willAutoRenew ?? false,
+  };
+}
+
 function parseSubscriptionOffers(value?: Nullable<string> | any[]) {
   if (!value) return undefined;
 
@@ -232,7 +258,7 @@ export function convertNitroProductToProduct(
     displayPrice: nitroProduct.displayPrice ?? '',
     currency: nitroProduct.currency ?? '',
     price: toNullableNumber(nitroProduct.price),
-    debugDescription: null,
+    debugDescription: nitroProduct.debugDescription ?? null,
     platform,
   };
 
@@ -244,7 +270,6 @@ export function convertNitroProductToProduct(
       jsonRepresentationIOS:
         nitroProduct.jsonRepresentationIOS ?? DEFAULT_JSON_REPR,
       typeIOS: normalizeProductTypeIOS(nitroProduct.typeIOS),
-      subscriptionInfoIOS: undefined,
     };
 
     iosProduct.introductoryPriceAsAmountIOS = toNullableString(
@@ -284,6 +309,31 @@ export function convertNitroProductToProduct(
       iosProduct.discountsIOS = null;
     }
 
+    if (nitroProduct.pricingTermsIOS) {
+      try {
+        const parsed = JSON.parse(nitroProduct.pricingTermsIOS);
+        iosProduct.pricingTermsIOS = Array.isArray(parsed) ? parsed : null;
+      } catch {
+        iosProduct.pricingTermsIOS = null;
+      }
+    } else {
+      iosProduct.pricingTermsIOS = null;
+    }
+
+    if (nitroProduct.subscriptionInfoIOS) {
+      try {
+        const parsed = JSON.parse(nitroProduct.subscriptionInfoIOS);
+        iosProduct.subscriptionInfoIOS =
+          typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)
+            ? parsed
+            : null;
+      } catch {
+        iosProduct.subscriptionInfoIOS = null;
+      }
+    } else {
+      iosProduct.subscriptionInfoIOS = null;
+    }
+
     // Parse standardized subscriptionOffers (cross-platform, OpenIAP 1.3.10+)
     if (nitroProduct.subscriptionOffers) {
       try {
@@ -418,8 +468,13 @@ export function convertNitroPurchaseToPurchase(
       quantity: nitroPurchase.quantity ?? 1,
       purchaseState,
       isAutoRenewing: Boolean(nitroPurchase.isAutoRenewing),
+      currentPlanId: toNullableString(nitroPurchase.currentPlanId),
+      ids: nitroPurchase.ids ?? null,
       // PurchaseIOS requires both id and transactionId (they are the same value)
       transactionId: nitroPurchase.id,
+      advancedCommerceInfoIOS: nitroPurchase.advancedCommerceInfoIOS ?? null,
+      billingPlanTypeIOS: nitroPurchase.billingPlanTypeIOS ?? null,
+      commitmentInfoIOS: nitroPurchase.commitmentInfoIOS ?? null,
       quantityIOS: toNullableNumber(nitroPurchase.quantityIOS),
       originalTransactionDateIOS: toNullableNumber(
         nitroPurchase.originalTransactionDateIOS,
@@ -464,39 +519,7 @@ export function convertNitroPurchaseToPurchase(
         nitroPurchase.webOrderLineItemIdIOS,
       ),
       renewalInfoIOS: nitroPurchase.renewalInfoIOS
-        ? {
-            autoRenewPreference: toNullableString(
-              nitroPurchase.renewalInfoIOS.autoRenewPreference,
-            ),
-            expirationReason: toNullableString(
-              nitroPurchase.renewalInfoIOS.expirationReason,
-            ),
-            gracePeriodExpirationDate: toNullableNumber(
-              nitroPurchase.renewalInfoIOS.gracePeriodExpirationDate,
-            ),
-            isInBillingRetry: toNullableBoolean(
-              nitroPurchase.renewalInfoIOS.isInBillingRetry,
-            ),
-            jsonRepresentation: toNullableString(
-              nitroPurchase.renewalInfoIOS.jsonRepresentation,
-            ),
-            pendingUpgradeProductId: toNullableString(
-              nitroPurchase.renewalInfoIOS.pendingUpgradeProductId,
-            ),
-            priceIncreaseStatus: toNullableString(
-              nitroPurchase.renewalInfoIOS.priceIncreaseStatus,
-            ),
-            renewalDate: toNullableNumber(
-              nitroPurchase.renewalInfoIOS.renewalDate,
-            ),
-            renewalOfferId: toNullableString(
-              nitroPurchase.renewalInfoIOS.renewalOfferId,
-            ),
-            renewalOfferType: toNullableString(
-              nitroPurchase.renewalInfoIOS.renewalOfferType,
-            ),
-            willAutoRenew: nitroPurchase.renewalInfoIOS.willAutoRenew ?? false,
-          }
+        ? convertNitroRenewalInfoToRenewalInfoIOS(nitroPurchase.renewalInfoIOS)
         : null,
     };
     return iosPurchase;
@@ -513,6 +536,8 @@ export function convertNitroPurchaseToPurchase(
     quantity: nitroPurchase.quantity ?? 1,
     purchaseState,
     isAutoRenewing: Boolean(nitroPurchase.isAutoRenewing),
+    currentPlanId: toNullableString(nitroPurchase.currentPlanId),
+    ids: nitroPurchase.ids ?? null,
     // PurchaseAndroid has optional transactionId (may differ from id/orderId)
     transactionId: toNullableString(nitroPurchase.id),
     autoRenewingAndroid: toNullableBoolean(
@@ -534,6 +559,8 @@ export function convertNitroPurchaseToPurchase(
       nitroPurchase.developerPayloadAndroid,
     ),
     isSuspendedAndroid: toNullableBoolean(nitroPurchase.isSuspendedAndroid),
+    pendingPurchaseUpdateAndroid:
+      nitroPurchase.pendingPurchaseUpdateAndroid ?? null,
   };
 
   return androidPurchase;
@@ -548,13 +575,7 @@ export function convertNitroSubscriptionStatusToSubscriptionStatusIOS(
   return {
     state: String(nitro.state ?? ''),
     renewalInfo: nitro.renewalInfo
-      ? {
-          autoRenewPreference: toNullableString(
-            nitro.renewalInfo.autoRenewPreference,
-          ),
-          jsonRepresentation: JSON.stringify(nitro.renewalInfo),
-          willAutoRenew: Boolean(nitro.renewalInfo.autoRenewStatus),
-        }
+      ? convertNitroRenewalInfoToRenewalInfoIOS(nitro.renewalInfo)
       : undefined,
   };
 }

package/src/vega-adapter.ts

@@ -9,6 +9,7 @@ import type {
   RnIap,
 } from './specs/RnIap.nitro';
 import {ErrorCode} from './types';
+import type {SubResponseCodeAndroid} from './types';
 
 type ResponseOperation =
   | 'product-data'
@@ -21,6 +22,7 @@ const IAPKIT_VERIFY_TIMEOUT_MS = 10_000;
 const MAX_IAPKIT_ERROR_DEPTH = 5;
 const MAX_PRODUCT_DATA_BATCH_SIZE = 100;
 const MAX_PURCHASE_UPDATE_PAGES = 100;
+const NOTIFY_FULFILLMENT_ATTEMPT_TIMEOUT_MS = 2_000;
 const NOTIFY_FULFILLMENT_MAX_ATTEMPTS = 15;
 const NOTIFY_FULFILLMENT_RETRY_DELAY_MS = 1_000;
 const PURCHASE_UPDATES_MAX_ATTEMPTS = 5;
@@ -96,9 +98,13 @@ interface VegaUserDataRequest {
 interface VegaError extends Error {
   code?: ErrorCode;
   debugMessage?: string;
+  isEmptyProductList?: boolean;
   platform?: 'android';
   productId?: string;
+  productIds?: string[];
+  productType?: string;
   responseCode?: number;
+  subResponseCodeAndroid?: SubResponseCodeAndroid;
 }
 
 export interface VegaPurchasingService {
@@ -150,8 +156,12 @@ function parseVegaErrorPayload(error: unknown): Record<string, unknown> {
   if (
     vegaError.code != null ||
     vegaError.debugMessage != null ||
+    vegaError.isEmptyProductList != null ||
     vegaError.productId != null ||
-    vegaError.responseCode != null
+    vegaError.productIds != null ||
+    vegaError.productType != null ||
+    vegaError.responseCode != null ||
+    vegaError.subResponseCodeAndroid != null
   ) {
     return {
       code: vegaError.code,
@@ -159,6 +169,10 @@ function parseVegaErrorPayload(error: unknown): Record<string, unknown> {
       responseCode: vegaError.responseCode,
       debugMessage: vegaError.debugMessage,
       productId: vegaError.productId,
+      productIds: vegaError.productIds,
+      productType: vegaError.productType,
+      isEmptyProductList: vegaError.isEmptyProductList,
+      subResponseCodeAndroid: vegaError.subResponseCodeAndroid,
       platform: vegaError.platform,
     };
   }
@@ -175,9 +189,12 @@ function parseVegaErrorPayload(error: unknown): Record<string, unknown> {
 function toPurchaseErrorResult(
   error: unknown,
   fallbackMessage: string,
+  productId?: string,
 ): NitroPurchaseResult {
   const parsed = parseVegaErrorPayload(error);
   const responseCode = parsed.responseCode;
+  const parsedProductIds = parsed.productIds;
+  const parsedSubResponseCode = parsed.subResponseCodeAndroid;
   return {
     responseCode: typeof responseCode === 'number' ? responseCode : -1,
     code:
@@ -191,6 +208,23 @@ function toPurchaseErrorResult(
     debugMessage:
       typeof parsed.debugMessage === 'string' ? parsed.debugMessage : undefined,
     purchaseToken: undefined,
+    productId:
+      typeof parsed.productId === 'string' ? parsed.productId : productId,
+    productIds: Array.isArray(parsedProductIds)
+      ? parsedProductIds.filter(
+          (candidate): candidate is string => typeof candidate === 'string',
+        )
+      : undefined,
+    productType:
+      typeof parsed.productType === 'string' ? parsed.productType : undefined,
+    isEmptyProductList:
+      typeof parsed.isEmptyProductList === 'boolean'
+        ? parsed.isEmptyProductList
+        : undefined,
+    subResponseCodeAndroid:
+      typeof parsedSubResponseCode === 'string'
+        ? (parsedSubResponseCode as SubResponseCodeAndroid)
+        : undefined,
   };
 }
 
@@ -207,6 +241,26 @@ function delay(ms: number): Promise<void> {
   });
 }
 
+function withTimeout<T>(
+  operation: Promise<T>,
+  timeoutMs: number,
+  timeoutError: Error,
+): Promise<T> {
+  return new Promise((resolve, reject) => {
+    const timeoutId = setTimeout(() => reject(timeoutError), timeoutMs);
+    operation.then(
+      (value) => {
+        clearTimeout(timeoutId);
+        resolve(value);
+      },
+      (error) => {
+        clearTimeout(timeoutId);
+        reject(error);
+      },
+    );
+  });
+}
+
 function isSuccess(
   operation: ResponseOperation,
   responseCode: unknown,
@@ -543,6 +597,8 @@ function mapReceipt(
     productId,
     transactionDate: toTimestamp(receipt.purchaseDate),
     purchaseToken: receiptId,
+    currentPlanId: type === 'subs' ? productId : null,
+    ids: productId ? [productId] : [],
     platform: 'android',
     store: 'amazon',
     quantity: 1,
@@ -698,8 +754,34 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
   };
 
   const getStorefront = async (): Promise<string> => {
-    await getUserData();
-    return cachedUserData?.marketplace ?? cachedUserData?.countryCode ?? '';
+    try {
+      const userData = await getUserData();
+      const storefront = userData?.marketplace ?? userData?.countryCode;
+      if (typeof storefront !== 'string' || storefront.trim().length === 0) {
+        throw createVegaError(
+          ErrorCode.ServiceError,
+          'Amazon Vega storefront lookup returned no country code.',
+        );
+      }
+      return storefront;
+    } catch (error) {
+      const errorCode =
+        error instanceof Error
+          ? (error as Error & {code?: unknown}).code
+          : undefined;
+      if (
+        typeof errorCode === 'string' &&
+        Object.values(ErrorCode).includes(errorCode as ErrorCode)
+      ) {
+        throw error;
+      }
+      throw createVegaError(
+        ErrorCode.ServiceError,
+        `Failed to get Amazon Vega storefront: ${
+          error instanceof Error ? error.message : String(error)
+        }`,
+      );
+    }
   };
 
   const getPurchaseUpdateReceipts = async (): Promise<VegaReceipt[]> => {
@@ -860,10 +942,17 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
       attempt <= NOTIFY_FULFILLMENT_MAX_ATTEMPTS;
       attempt += 1
     ) {
-      const response = await service.notifyFulfillment({
-        fulfillmentResult: FULFILLMENT_RESULT_FULFILLED,
-        receiptId: purchaseToken,
-      });
+      const response = await withTimeout(
+        service.notifyFulfillment({
+          fulfillmentResult: FULFILLMENT_RESULT_FULFILLED,
+          receiptId: purchaseToken,
+        }),
+        NOTIFY_FULFILLMENT_ATTEMPT_TIMEOUT_MS,
+        createVegaError(
+          ErrorCode.ServiceTimeout,
+          'Amazon Vega notifyFulfillment timed out.',
+        ),
+      );
       if (isSuccess('notify-fulfillment', response?.responseCode)) {
         return {
           responseCode: 0,
@@ -872,7 +961,6 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
           purchaseToken,
         };
       }
-
       lastResponse = response;
       if (attempt < NOTIFY_FULFILLMENT_MAX_ATTEMPTS) {
         await delay(NOTIFY_FULFILLMENT_RETRY_DELAY_MS);
@@ -909,7 +997,8 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
       const purchaseTimestamp = toTimestamp(receipt.purchaseDate);
       if (
         options?.minPurchaseDateMs != null &&
-        (purchaseTimestamp === 0 || purchaseTimestamp < options.minPurchaseDateMs)
+        (purchaseTimestamp === 0 ||
+          purchaseTimestamp < options.minPurchaseDateMs)
       ) {
         continue;
       }
@@ -1286,11 +1375,7 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
         if (!response.receipt) return [];
 
         cachedUserData = response.userData ?? cachedUserData;
-        const purchase = mapReceipt(
-          response.receipt,
-          fallbackProductType,
-          sku,
-        );
+        const purchase = mapReceipt(response.receipt, fallbackProductType, sku);
         emitPurchaseUpdated(purchase);
         return [purchase];
       } catch (error) {
@@ -1298,6 +1383,7 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
           toPurchaseErrorResult(
             error,
             'Failed to complete Amazon Vega purchase',
+            sku,
           ),
         );
         throw error;
@@ -1377,7 +1463,7 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
     async getPromotedProductIOS(): Promise<null> {
       return throwUnsupportedFeature('getPromotedProductIOS');
     },
-    async buyPromotedProductIOS(): Promise<void> {
+    async buyPromotedProductIOS(): Promise<boolean> {
       return throwUnsupportedFeature('buyPromotedProductIOS');
     },
     async presentCodeRedemptionSheetIOS(): Promise<boolean> {
@@ -1469,11 +1555,22 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
     async isBillingProgramAvailableAndroid(): Promise<never> {
       return throwUnsupportedFeature('isBillingProgramAvailableAndroid');
     },
+    async getBillingChoiceInfoAndroid(): Promise<never> {
+      return throwUnsupportedFeature('getBillingChoiceInfoAndroid');
+    },
     async createBillingProgramReportingDetailsAndroid(): Promise<never> {
       return throwUnsupportedFeature(
         'createBillingProgramReportingDetailsAndroid',
       );
     },
+    async showBillingProgramInformationDialogAndroid(): Promise<never> {
+      return throwUnsupportedFeature(
+        'showBillingProgramInformationDialogAndroid',
+      );
+    },
+    async showInAppMessagesAndroid(): Promise<never> {
+      return throwUnsupportedFeature('showInAppMessagesAndroid');
+    },
     async launchExternalLinkAndroid(): Promise<boolean> {
       return throwUnsupportedFeature('launchExternalLinkAndroid');
     },

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

@@ -1,83 +0,0 @@
-///
-/// JNitroSubscriptionRenewalInfo.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 "NitroSubscriptionRenewalInfo.hpp"
-
-#include "JVariant_NullType_Double.hpp"
-#include "JVariant_NullType_String.hpp"
-#include <NitroModules/JNull.hpp>
-#include <NitroModules/Null.hpp>
-#include <optional>
-#include <string>
-#include <variant>
-
-namespace margelo::nitro::iap {
-
-  using namespace facebook;
-
-  /**
-   * The C++ JNI bridge between the C++ struct "NitroSubscriptionRenewalInfo" and the the Kotlin data class "NitroSubscriptionRenewalInfo".
-   */
-  struct JNitroSubscriptionRenewalInfo final: public jni::JavaClass<JNitroSubscriptionRenewalInfo> {
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/iap/NitroSubscriptionRenewalInfo;";
-
-  public:
-    /**
-     * Convert this Java/Kotlin-based struct to the C++ struct NitroSubscriptionRenewalInfo by copying all values to C++.
-     */
-    [[maybe_unused]]
-    [[nodiscard]]
-    NitroSubscriptionRenewalInfo toCpp() const {
-      static const auto clazz = javaClassStatic();
-      static const auto fieldAutoRenewStatus = clazz->getField<jboolean>("autoRenewStatus");
-      jboolean autoRenewStatus = this->getFieldValue(fieldAutoRenewStatus);
-      static const auto fieldAutoRenewPreference = clazz->getField<JVariant_NullType_String>("autoRenewPreference");
-      jni::local_ref<JVariant_NullType_String> autoRenewPreference = this->getFieldValue(fieldAutoRenewPreference);
-      static const auto fieldExpirationReason = clazz->getField<JVariant_NullType_Double>("expirationReason");
-      jni::local_ref<JVariant_NullType_Double> expirationReason = this->getFieldValue(fieldExpirationReason);
-      static const auto fieldGracePeriodExpirationDate = clazz->getField<JVariant_NullType_Double>("gracePeriodExpirationDate");
-      jni::local_ref<JVariant_NullType_Double> gracePeriodExpirationDate = this->getFieldValue(fieldGracePeriodExpirationDate);
-      static const auto fieldCurrentProductID = clazz->getField<JVariant_NullType_String>("currentProductID");
-      jni::local_ref<JVariant_NullType_String> currentProductID = this->getFieldValue(fieldCurrentProductID);
-      static const auto fieldPlatform = clazz->getField<jni::JString>("platform");
-      jni::local_ref<jni::JString> platform = this->getFieldValue(fieldPlatform);
-      return NitroSubscriptionRenewalInfo(
-        static_cast<bool>(autoRenewStatus),
-        autoRenewPreference != nullptr ? std::make_optional(autoRenewPreference->toCpp()) : std::nullopt,
-        expirationReason != nullptr ? std::make_optional(expirationReason->toCpp()) : std::nullopt,
-        gracePeriodExpirationDate != nullptr ? std::make_optional(gracePeriodExpirationDate->toCpp()) : std::nullopt,
-        currentProductID != nullptr ? std::make_optional(currentProductID->toCpp()) : std::nullopt,
-        platform->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<JNitroSubscriptionRenewalInfo::javaobject> fromCpp(const NitroSubscriptionRenewalInfo& value) {
-      using JSignature = JNitroSubscriptionRenewalInfo(jboolean, jni::alias_ref<JVariant_NullType_String>, jni::alias_ref<JVariant_NullType_Double>, jni::alias_ref<JVariant_NullType_Double>, jni::alias_ref<JVariant_NullType_String>, jni::alias_ref<jni::JString>);
-      static const auto clazz = javaClassStatic();
-      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
-      return create(
-        clazz,
-        value.autoRenewStatus,
-        value.autoRenewPreference.has_value() ? JVariant_NullType_String::fromCpp(value.autoRenewPreference.value()) : nullptr,
-        value.expirationReason.has_value() ? JVariant_NullType_Double::fromCpp(value.expirationReason.value()) : nullptr,
-        value.gracePeriodExpirationDate.has_value() ? JVariant_NullType_Double::fromCpp(value.gracePeriodExpirationDate.value()) : nullptr,
-        value.currentProductID.has_value() ? JVariant_NullType_String::fromCpp(value.currentProductID.value()) : nullptr,
-        jni::make_jstring(value.platform)
-      );
-    }
-  };
-
-} // namespace margelo::nitro::iap

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

@@ -1,26 +0,0 @@
-///
-/// JVariant_NullType_NitroSubscriptionRenewalInfo.cpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-#include "JVariant_NullType_NitroSubscriptionRenewalInfo.hpp"
-
-namespace margelo::nitro::iap {
-  /**
-   * Converts JVariant_NullType_NitroSubscriptionRenewalInfo to std::variant<nitro::NullType, NitroSubscriptionRenewalInfo>
-   */
-  std::variant<nitro::NullType, NitroSubscriptionRenewalInfo> JVariant_NullType_NitroSubscriptionRenewalInfo::toCpp() const {
-    if (isInstanceOf(JVariant_NullType_NitroSubscriptionRenewalInfo_impl::First::javaClassStatic())) {
-      // It's a `nitro::NullType`
-      auto jniValue = static_cast<const JVariant_NullType_NitroSubscriptionRenewalInfo_impl::First*>(this)->getValue();
-      return nitro::null;
-    } else if (isInstanceOf(JVariant_NullType_NitroSubscriptionRenewalInfo_impl::Second::javaClassStatic())) {
-      // It's a `NitroSubscriptionRenewalInfo`
-      auto jniValue = static_cast<const JVariant_NullType_NitroSubscriptionRenewalInfo_impl::Second*>(this)->getValue();
-      return jniValue->toCpp();
-    }
-    throw std::invalid_argument("Variant is unknown Kotlin instance!");
-  }
-} // namespace margelo::nitro::iap