From 9e0726931057fadb835ff7cbc0cac4044961af3b Mon Sep 17 00:00:00 2001
From: Surik <action@github.com>
Date: Mon, 10 Nov 2025 23:15:39 +0300
Subject: [PATCH 1/5] Updated nocodes logic and dart version

---
 android/build.gradle                          |   4 +-
 example/android/app/build.gradle              |  12 +-
 example/android/app/google-services.json      |  27 +--
 example/android/app/local.properties          |   8 +
 .../android/app/src/main/AndroidManifest.xml  |   4 +-
 .../assets/qonversion_android_fallbacks.json  |   9 +-
 .../qonversion/sampleapp}/MainActivity.kt     |   2 +-
 example/android/build.gradle                  |   3 +-
 example/android/gradle.properties             |   2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +-
 example/ios/Runner.xcodeproj/project.pbxproj  |   2 -
 example/lib/params_view.dart                  |   3 +-
 example/pubspec.yaml                          |   4 +-
 ios/Classes/FlutterError+Custom.swift         |   9 +-
 ios/Classes/NoCodesPlugin.swift               |   3 +-
 ios/qonversion_flutter.podspec                |   2 +-
 lib/qonversion_flutter.dart                   |   1 -
 lib/src/dto/product.dart                      |  62 ++-----
 lib/src/dto/product.g.dart                    |   2 -
 lib/src/dto/qonversion_error.g.dart           |   1 +
 lib/src/dto/qonversion_error_code.dart        |   5 +
 lib/src/dto/sku_details/sku_details.dart      | 154 ------------------
 lib/src/dto/sku_details/sku_details.g.dart    |  54 ------
 lib/src/internal/mapper.dart                  |  16 --
 lib/src/internal/nocodes_internal.dart        |   1 +
 lib/src/internal/qonversion_internal.dart     |  15 +-
 lib/src/nocodes_config.dart                   |   3 +-
 lib/src/nocodes_config_builder.dart           |  12 +-
 macos/Classes/FlutterError+Custom.swift       |   9 +-
 pubspec.lock                                  |  16 +-
 pubspec.yaml                                  |   4 +-
 test/qonversion.dart                          |   6 +-
 32 files changed, 106 insertions(+), 354 deletions(-)
 create mode 100644 example/android/app/local.properties
 rename example/android/app/src/main/kotlin/{com/qonversion/sample => io/qonversion/sampleapp}/MainActivity.kt (92%)
 delete mode 100644 lib/src/dto/sku_details/sku_details.dart
 delete mode 100644 lib/src/dto/sku_details/sku_details.g.dart

diff --git a/android/build.gradle b/android/build.gradle
index 5fbbad53..7db0153c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
 
     dependencies {
@@ -19,7 +18,6 @@ rootProject.allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
         mavenLocal()
     }
 }
@@ -53,6 +51,6 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "io.qonversion:sandwich:6.0.11"
+    implementation "io.qonversion:sandwich:7.0.0"
     implementation 'com.google.code.gson:gson:2.9.0'
 }
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 15b9519f..f551a019 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -32,7 +32,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.qonversion.sample"
+        applicationId "io.qonversion.sampleapp"
         minSdkVersion 21
         targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
@@ -74,7 +74,7 @@ android {
     lint {
         disable 'InvalidPackage'
     }
-    namespace 'com.qonversion.sample'
+    namespace 'io.qonversion.sampleapp'
 }
 
 flutter {
@@ -86,4 +86,12 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
     implementation 'androidx.multidex:multidex:2.0.1'
+//    implementation project(':qonversion_flutter')
+}
+
+// Задача wrapper для совместимости с Android Studio
+tasks.register("wrapper") {
+    doLast {
+        println "Wrapper task is only available in root project. Use './gradlew wrapper' from root."
+    }
 }
diff --git a/example/android/app/google-services.json b/example/android/app/google-services.json
index 172f3660..049d1675 100644
--- a/example/android/app/google-services.json
+++ b/example/android/app/google-services.json
@@ -1,37 +1,26 @@
 {
   "project_info": {
-    "project_number": "11599271839",
-    "firebase_url": "https://qonversion-sample-app.firebaseio.com",
-    "project_id": "qonversion-sample-app",
-    "storage_bucket": "qonversion-sample-app.appspot.com"
+    "project_number": "176235602178",
+    "project_id": "qonversion-sample-applic-eb8a7",
+    "storage_bucket": "qonversion-sample-applic-eb8a7.firebasestorage.app"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:11599271839:android:134918dd6bba6f6970cfaa",
+        "mobilesdk_app_id": "1:176235602178:android:b090da6fa0510c7192621b",
         "android_client_info": {
-          "package_name": "com.qonversion.sample"
+          "package_name": "io.qonversion.sampleapp"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "11599271839-jg1njos9hp2d07jg7d3oqi523io0pdr6.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyClJuW1Z3_lUnvnsCtjDl-P2vgTLMK39OA"
+          "current_key": "AIzaSyA0fYxEeTDdoXZopKU54FtsN75FAcmZE9U"
         }
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "11599271839-jg1njos9hp2d07jg7d3oqi523io0pdr6.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     }
diff --git a/example/android/app/local.properties b/example/android/app/local.properties
new file mode 100644
index 00000000..4c1719b6
--- /dev/null
+++ b/example/android/app/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Nov 10 16:23:11 MSK 2025
+sdk.dir=/Users/suriksarkisyan/Library/Android/sdk
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 97f50f26..c0f731a3 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.qonversion.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.qonversion.sampleapp">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="com.android.vending.BILLING"/>
     <application
-        android:label="com.qonversion.sample"
+        android:label="io.qonversion.sampleapp"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name="io.flutter.embedding.android.FlutterActivity"
diff --git a/example/android/app/src/main/assets/qonversion_android_fallbacks.json b/example/android/app/src/main/assets/qonversion_android_fallbacks.json
index 153c5e72..9983167e 100644
--- a/example/android/app/src/main/assets/qonversion_android_fallbacks.json
+++ b/example/android/app/src/main/assets/qonversion_android_fallbacks.json
@@ -62,9 +62,9 @@
    "type": 2
   },
   {
-   "id": "subs_plus_trial",
+   "id": "semi-premium",
    "duration": 1,
-   "store_id": "gp5_test_subscription_4",
+   "store_id": "semi_premium",
    "type": 0
   },
   {
@@ -138,8 +138,9 @@
    "plus"
   ],
   "consumable": [],
-  "subs_plus_trial": [
-   "standart"
+  "semi-premium": [
+   "premium",
+   "semi_premium"
   ],
   "annual": [
    "standart",
diff --git a/example/android/app/src/main/kotlin/com/qonversion/sample/MainActivity.kt b/example/android/app/src/main/kotlin/io/qonversion/sampleapp/MainActivity.kt
similarity index 92%
rename from example/android/app/src/main/kotlin/com/qonversion/sample/MainActivity.kt
rename to example/android/app/src/main/kotlin/io/qonversion/sampleapp/MainActivity.kt
index 00c83ce0..e071abe8 100644
--- a/example/android/app/src/main/kotlin/com/qonversion/sample/MainActivity.kt
+++ b/example/android/app/src/main/kotlin/io/qonversion/sampleapp/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.qonversion.sample
+package io.qonversion.sampleapp
 
 import androidx.annotation.NonNull;
 import io.flutter.embedding.android.FlutterActivity
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 5869be3d..462b3342 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -1,7 +1,7 @@
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -16,3 +16,4 @@ subprojects {
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
+
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index 94adc3a3..1659b308 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 6c4ab420..df97d72b 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Fri Dec 04 11:26:13 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index 8f347fbe..dbba3cb4 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -267,14 +267,12 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/NoCodes/NoCodes.framework",
 				"${BUILT_PRODUCTS_DIR}/Qonversion/Qonversion.framework",
 				"${BUILT_PRODUCTS_DIR}/QonversionSandwich/QonversionSandwich.framework",
 				"${BUILT_PRODUCTS_DIR}/qonversion_flutter/qonversion_flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NoCodes.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qonversion.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QonversionSandwich.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/qonversion_flutter.framework",
diff --git a/example/lib/params_view.dart b/example/lib/params_view.dart
index c81bff87..2a9fd0b6 100644
--- a/example/lib/params_view.dart
+++ b/example/lib/params_view.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:qonversion_flutter/qonversion_flutter.dart';
 
@@ -62,7 +61,7 @@ class ParamsView extends StatelessWidget {
             ),
             for (final v in QUserPropertyKey.values)
               TextButton(
-                child: Text('Set ${describeEnum(v)}'),
+                child: Text('Set ${v.name}'),
                 style: ButtonStyle(
                   backgroundColor: WidgetStateProperty.all(Colors.purple),
                   foregroundColor: WidgetStateProperty.all(Colors.white),
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 51f7b2fb..f54a5432 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -6,8 +6,8 @@ publish_to: 'none'
 version: 1.0.0
 
 environment:
-  sdk: ">=2.14.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.6"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
   flutter:
diff --git a/ios/Classes/FlutterError+Custom.swift b/ios/Classes/FlutterError+Custom.swift
index 64e8aff8..6f219418 100644
--- a/ios/Classes/FlutterError+Custom.swift
+++ b/ios/Classes/FlutterError+Custom.swift
@@ -29,13 +29,6 @@ extension FlutterError {
                                                details: "")
   
   private static func mapSandwichError(_ error: SandwichError, errorCode: String, errorMessage: String? = nil) -> FlutterError {
-    var message = ""
-    
-    if let errorMessage = errorMessage {
-      message = errorMessage + ". "
-    }
-    message += error.details
-    
     var details = "Qonversion Error Code: \(error.code)"
     
     if let additionalMessage = error.additionalMessage {
@@ -43,7 +36,7 @@ extension FlutterError {
     }
     
     return FlutterError(code: errorCode,
-                        message: message,
+                        message: error.details,
                         details: details)
   }
 }
diff --git a/ios/Classes/NoCodesPlugin.swift b/ios/Classes/NoCodesPlugin.swift
index c1cb83d7..dd9a6c96 100644
--- a/ios/Classes/NoCodesPlugin.swift
+++ b/ios/Classes/NoCodesPlugin.swift
@@ -71,7 +71,8 @@ public class NoCodesPlugin: NSObject {
             noCodesSandwich = NoCodesSandwich(noCodesEventListener: self)
         }
         
-        noCodesSandwich?.initialize(projectKey: projectKey)
+        let proxyUrl = args["proxyUrl"] as? String
+        noCodesSandwich?.initialize(projectKey: projectKey, proxyUrl: proxyUrl)
         result(nil)
     }
     
diff --git a/ios/qonversion_flutter.podspec b/ios/qonversion_flutter.podspec
index f2e1d85d..03e51fb6 100644
--- a/ios/qonversion_flutter.podspec
+++ b/ios/qonversion_flutter.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
   s.platform = :ios, '13.0'
-  s.dependency "QonversionSandwich", "6.0.11"
+  s.dependency "QonversionSandwich", "7.0.0"
 
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
diff --git a/lib/qonversion_flutter.dart b/lib/qonversion_flutter.dart
index 4a4cae82..34ea5038 100644
--- a/lib/qonversion_flutter.dart
+++ b/lib/qonversion_flutter.dart
@@ -37,7 +37,6 @@ export 'src/dto/sk_product/sk_product.dart';
 export 'src/dto/sk_product/sk_product_discount.dart';
 export 'src/dto/sk_product/subscription_period.dart';
 export 'src/dto/sk_product/subscription_period_unit.dart';
-export 'src/dto/sku_details/sku_details.dart';
 export 'src/dto/store_product/product_inapp_details.dart';
 export 'src/dto/store_product/product_installment_plan_details.dart';
 export 'src/dto/store_product/product_offer_details.dart';
diff --git a/lib/src/dto/product.dart b/lib/src/dto/product.dart
index d05caf46..03dede9f 100644
--- a/lib/src/dto/product.dart
+++ b/lib/src/dto/product.dart
@@ -8,7 +8,6 @@ import 'product_type.dart';
 import 'purchase_model.dart';
 import 'purchase_update_model.dart';
 import 'sk_product/sk_product.dart';
-import 'sku_details/sku_details.dart';
 import 'sk_product/sk_product_discount.dart';
 import '../internal/mapper.dart';
 import 'subscription_period.dart';
@@ -34,14 +33,6 @@ class QProduct {
   @JsonKey(name: 'basePlanId')
   final String? basePlanId;
 
-  /// Google Play Store details of this product.
-  /// Android only. Null for iOS, or if the product was not found.
-  /// Doesn't take into account [basePlanId].
-  /// @deprecated Consider using [storeDetails] instead.
-  @JsonKey(name: 'skuDetails', fromJson: QMapper.skuDetailsFromJson)
-  // ignore: deprecated_member_use_from_same_package
-  final SkuDetailsWrapper? skuDetails;
-
   /// Google Play Store details of this product.
   /// Android only. Null for iOS, or if the product was not found.
   @JsonKey(name: 'storeDetails', fromJson: QMapper.storeProductDetailsFromJson)
@@ -57,8 +48,7 @@ class QProduct {
   @JsonKey(name: 'offeringId')
   final String? offeringId;
 
-  /// For Android - the subscription base plan duration. If the [basePlanId] is not specified,
-  /// the duration is calculated using the deprecated [skuDetails].
+  /// For Android - the subscription base plan duration from [storeDetails].
   /// For iOS - the duration of the [skProduct].
   /// Null, if it's not a subscription product or the product was not found in the store.
   @JsonKey(name: 'subscriptionPeriod', fromJson: QMapper.subscriptionPeriodFromJson)
@@ -72,8 +62,7 @@ class QProduct {
   final QSubscriptionPeriod? trialPeriod;
 
   /// The calculated type of this product based on the store information.
-  /// On Android uses deprecated [skuDetails] for the old subscription products
-  /// where [basePlanId] is not specified, and [storeDetails] for all the other products.
+  /// On Android uses [storeDetails] for product information.
   /// On iOS uses [skProduct] information.
   @JsonKey(name: 'type', unknownEnumValue: QProductType.unknown)
   final QProductType type;
@@ -106,7 +95,6 @@ class QProduct {
       this.qonversionId,
       this.storeId,
       this.basePlanId,
-      this.skuDetails,
       this.storeDetails,
       this.skProduct,
       this.offeringId,
@@ -115,7 +103,6 @@ class QProduct {
       this.type,
       this.prettyPrice,
     ) {
-    final skuDetails = this.skuDetails;
     final storeDetails = this.storeDetails;
     final skProduct = this.skProduct;
 
@@ -130,38 +117,21 @@ class QProduct {
       if (introPrice != null && currencySymbol != null) {
         prettyIntroductoryPrice = currencySymbol + introPrice.price;
       }
-    } else {
-      var priceMicros;
-      if (skuDetails != null) {
-        storeTitle = skuDetails.title;
-        storeDescription = skuDetails.description;
-
-        priceMicros = skuDetails.priceAmountMicros;
-        currencyCode = skuDetails.priceCurrencyCode;
-
-        final String? introPrice = skuDetails.introductoryPrice;
-        if (introPrice != null && introPrice.isEmpty) {
-          prettyIntroductoryPrice = null;
-        } else {
-          prettyIntroductoryPrice = introPrice;
-        }
-      }
+    } else if (storeDetails != null) {
+      storeTitle = storeDetails.title;
+      storeDescription = storeDetails.description;
 
-      if (storeDetails != null) {
-        storeTitle = storeDetails.title;
-        storeDescription = storeDetails.description;
-
-        final QProductOfferDetails? defaultOffer = storeDetails.defaultSubscriptionOfferDetails;
-        final QProductInAppDetails? inAppOffer = storeDetails.inAppOfferDetails;
-        if (defaultOffer != null) {
-          priceMicros = defaultOffer.basePlan?.price.priceAmountMicros;
-          currencyCode = defaultOffer.basePlan?.price.priceCurrencyCode;
-          prettyIntroductoryPrice = defaultOffer.introPhase?.price.formattedPrice;
-        } else if (inAppOffer != null) {
-          priceMicros = inAppOffer.price.priceAmountMicros;
-          currencyCode = inAppOffer.price.priceCurrencyCode;
-          prettyIntroductoryPrice = null;
-        }
+      final QProductOfferDetails? defaultOffer = storeDetails.defaultSubscriptionOfferDetails;
+      final QProductInAppDetails? inAppOffer = storeDetails.inAppOfferDetails;
+      var priceMicros;
+      if (defaultOffer != null) {
+        priceMicros = defaultOffer.basePlan?.price.priceAmountMicros;
+        currencyCode = defaultOffer.basePlan?.price.priceCurrencyCode;
+        prettyIntroductoryPrice = defaultOffer.introPhase?.price.formattedPrice;
+      } else if (inAppOffer != null) {
+        priceMicros = inAppOffer.price.priceAmountMicros;
+        currencyCode = inAppOffer.price.priceCurrencyCode;
+        prettyIntroductoryPrice = null;
       }
 
       price = priceMicros == null
diff --git a/lib/src/dto/product.g.dart b/lib/src/dto/product.g.dart
index 5d3cd7ff..65640f9a 100644
--- a/lib/src/dto/product.g.dart
+++ b/lib/src/dto/product.g.dart
@@ -10,7 +10,6 @@ QProduct _$QProductFromJson(Map<String, dynamic> json) => QProduct(
       json['id'] as String,
       json['storeId'] as String?,
       json['basePlanId'] as String?,
-      QMapper.skuDetailsFromJson(json['skuDetails']),
       QMapper.storeProductDetailsFromJson(json['storeDetails']),
       QMapper.skProductFromJson(json['skProduct']),
       json['offeringId'] as String?,
@@ -25,7 +24,6 @@ Map<String, dynamic> _$QProductToJson(QProduct instance) => <String, dynamic>{
       'id': instance.qonversionId,
       'storeId': instance.storeId,
       'basePlanId': instance.basePlanId,
-      'skuDetails': instance.skuDetails,
       'storeDetails': instance.storeDetails,
       'skProduct': instance.skProduct,
       'offeringId': instance.offeringId,
diff --git a/lib/src/dto/qonversion_error.g.dart b/lib/src/dto/qonversion_error.g.dart
index 56141d8e..f289033d 100644
--- a/lib/src/dto/qonversion_error.g.dart
+++ b/lib/src/dto/qonversion_error.g.dart
@@ -41,6 +41,7 @@ const _$QErrorCodeEnumMap = {
   QErrorCode.launchError: 'LaunchError',
   QErrorCode.networkConnectionFailed: 'NetworkConnectionFailed',
   QErrorCode.offeringsNotFound: 'OfferingsNotFound',
+  QErrorCode.offeringsNotAvailable: 'OfferingsNotAvailable',
   QErrorCode.paymentInvalid: 'PaymentInvalid',
   QErrorCode.paymentNotAllowed: 'PaymentNotAllowed',
   QErrorCode.playStoreError: 'PlayStoreError',
diff --git a/lib/src/dto/qonversion_error_code.dart b/lib/src/dto/qonversion_error_code.dart
index 872f50a5..f2ac84bc 100644
--- a/lib/src/dto/qonversion_error_code.dart
+++ b/lib/src/dto/qonversion_error_code.dart
@@ -83,6 +83,10 @@ enum QErrorCode {
   @JsonValue('OfferingsNotFound')
   offeringsNotFound,
 
+  /// Offerings are not available
+  @JsonValue('OfferingsNotAvailable')
+  offeringsNotAvailable,
+
   /// Purchase identifier was invalid, etc.
   @JsonValue('PaymentInvalid')
   paymentInvalid,
@@ -177,6 +181,7 @@ const _codes = {
   QErrorCode.launchError: 'LaunchError',
   QErrorCode.networkConnectionFailed: 'NetworkConnectionFailed',
   QErrorCode.offeringsNotFound: 'OfferingsNotFound',
+  QErrorCode.offeringsNotAvailable: 'OfferingsNotAvailable',
   QErrorCode.paymentInvalid: 'PaymentInvalid',
   QErrorCode.paymentNotAllowed: 'PaymentNotAllowed',
   QErrorCode.playStoreError: 'PlayStoreError',
diff --git a/lib/src/dto/sku_details/sku_details.dart b/lib/src/dto/sku_details/sku_details.dart
deleted file mode 100644
index 08edf1cb..00000000
--- a/lib/src/dto/sku_details/sku_details.dart
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-
-import 'package:json_annotation/json_annotation.dart';
-
-part 'sku_details.g.dart';
-
-// ignore: deprecated_member_use_from_same_package
-/// Enum representing potential [SkuDetailsWrapper.type]s.
-///
-/// Wraps
-/// [`BillingClient.SkuType`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.SkuType)
-/// See the linked documentation for an explanation of the different constants.
-enum SkuType {
-// WARNING: Changes to this class need to be reflected in our generated code.
-// Run `flutter packages pub run build_runner watch` to rebuild and watch for
-// further changes.
-
-  /// A one time product. Acquired in a single transaction.
-  @JsonValue('inapp')
-  inapp,
-
-  /// A product requiring a recurring charge over time.
-  @JsonValue('subs')
-  subs,
-}
-
-/// Dart wrapper around [`com.android.billingclient.api.SkuDetails`](https://developer.android.com/reference/com/android/billingclient/api/SkuDetails).
-///
-/// Contains the details of an available product in Google Play Billing.
-///
-@Deprecated("Consider using QProductStoreDetails instead")
-@JsonSerializable()
-class SkuDetailsWrapper {
-  /// Textual description of the product.
-  final String description;
-
-  /// Trial period in ISO 8601 format.
-  final String freeTrialPeriod;
-
-  /// Introductory price, only applies to [SkuType.subs]. Formatted ("$0.99").
-  final String introductoryPrice;
-
-  /// Introductory price in micro-units 990000
-  final int introductoryPriceAmountMicros;
-
-  /// The number of billing perios that [introductoryPrice] is valid for ("2").
-  final int introductoryPriceCycles;
-
-  /// The billing period of [introductoryPrice], in ISO 8601 format.
-  final String introductoryPricePeriod;
-
-  /// Formatted with currency symbol ("$0.99").
-  final String price;
-
-  /// [price] in micro-units (990000).
-  final int priceAmountMicros;
-
-  /// [price] ISO 4217 currency code.
-  final String priceCurrencyCode;
-
-  /// The product ID in Google Play Console.
-  final String sku;
-
-  /// Applies to [SkuType.subs], formatted in ISO 8601.
-  final String subscriptionPeriod;
-
-  /// The product's title.
-  final String title;
-
-  /// The [SkuType] of the product.
-  final SkuType type;
-
-  /// The original price that the user purchased this product for.
-  final String originalPrice;
-
-  /// [originalPrice] in micro-units (990000).
-  final int originalPriceAmountMicros;
-
-  /// SKU details in JSON format.
-  final String originalJson;
-
-  /// Creates a [SkuDetailsWrapper] with the given purchase details.
-  SkuDetailsWrapper(
-      {required this.description,
-      required this.freeTrialPeriod,
-      required this.introductoryPrice,
-      required this.introductoryPriceAmountMicros,
-      required this.introductoryPriceCycles,
-      required this.introductoryPricePeriod,
-      required this.price,
-      required this.priceAmountMicros,
-      required this.priceCurrencyCode,
-      required this.sku,
-      required this.subscriptionPeriod,
-      required this.title,
-      required this.type,
-      required this.originalPrice,
-      required this.originalPriceAmountMicros,
-      required this.originalJson});
-
-  /// Constructs an instance of this from a key value map of data.
-  ///
-  /// The map needs to have named string keys with values matching the names and
-  /// types of all of the members on this class.
-  factory SkuDetailsWrapper.fromJson(Map<String, dynamic> map) =>
-      _$SkuDetailsWrapperFromJson(map);
-
-  Map<String, dynamic> toJson() => _$SkuDetailsWrapperToJson(this);
-
-  @override
-  bool operator ==(Object other) {
-    if (other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    return other is SkuDetailsWrapper &&
-        other.description == description &&
-        other.freeTrialPeriod == freeTrialPeriod &&
-        other.introductoryPrice == introductoryPrice &&
-        other.introductoryPriceAmountMicros ==
-            introductoryPriceAmountMicros &&
-        other.introductoryPriceCycles == introductoryPriceCycles &&
-        other.introductoryPricePeriod == introductoryPricePeriod &&
-        other.price == price &&
-        other.priceAmountMicros == priceAmountMicros &&
-        other.sku == sku &&
-        other.subscriptionPeriod == subscriptionPeriod &&
-        other.title == title &&
-        other.type == type &&
-        other.originalPrice == originalPrice &&
-        other.originalPriceAmountMicros == originalPriceAmountMicros &&
-        other.originalJson == originalJson;
-  }
-
-  @override
-  int get hashCode {
-    return Object.hash(
-        description.hashCode,
-        freeTrialPeriod.hashCode,
-        introductoryPrice.hashCode,
-        introductoryPriceAmountMicros.hashCode,
-        introductoryPriceCycles.hashCode,
-        introductoryPricePeriod.hashCode,
-        price.hashCode,
-        priceAmountMicros.hashCode,
-        sku.hashCode,
-        subscriptionPeriod.hashCode,
-        title.hashCode,
-        type.hashCode,
-        originalPrice,
-        originalPriceAmountMicros,
-        originalJson.hashCode);
-  }
-}
diff --git a/lib/src/dto/sku_details/sku_details.g.dart b/lib/src/dto/sku_details/sku_details.g.dart
deleted file mode 100644
index b4d728fc..00000000
--- a/lib/src/dto/sku_details/sku_details.g.dart
+++ /dev/null
@@ -1,54 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'sku_details.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-SkuDetailsWrapper _$SkuDetailsWrapperFromJson(Map<String, dynamic> json) =>
-    SkuDetailsWrapper(
-      description: json['description'] as String,
-      freeTrialPeriod: json['freeTrialPeriod'] as String,
-      introductoryPrice: json['introductoryPrice'] as String,
-      introductoryPriceAmountMicros:
-          (json['introductoryPriceAmountMicros'] as num).toInt(),
-      introductoryPriceCycles: (json['introductoryPriceCycles'] as num).toInt(),
-      introductoryPricePeriod: json['introductoryPricePeriod'] as String,
-      price: json['price'] as String,
-      priceAmountMicros: (json['priceAmountMicros'] as num).toInt(),
-      priceCurrencyCode: json['priceCurrencyCode'] as String,
-      sku: json['sku'] as String,
-      subscriptionPeriod: json['subscriptionPeriod'] as String,
-      title: json['title'] as String,
-      type: $enumDecode(_$SkuTypeEnumMap, json['type']),
-      originalPrice: json['originalPrice'] as String,
-      originalPriceAmountMicros:
-          (json['originalPriceAmountMicros'] as num).toInt(),
-      originalJson: json['originalJson'] as String,
-    );
-
-Map<String, dynamic> _$SkuDetailsWrapperToJson(SkuDetailsWrapper instance) =>
-    <String, dynamic>{
-      'description': instance.description,
-      'freeTrialPeriod': instance.freeTrialPeriod,
-      'introductoryPrice': instance.introductoryPrice,
-      'introductoryPriceAmountMicros': instance.introductoryPriceAmountMicros,
-      'introductoryPriceCycles': instance.introductoryPriceCycles,
-      'introductoryPricePeriod': instance.introductoryPricePeriod,
-      'price': instance.price,
-      'priceAmountMicros': instance.priceAmountMicros,
-      'priceCurrencyCode': instance.priceCurrencyCode,
-      'sku': instance.sku,
-      'subscriptionPeriod': instance.subscriptionPeriod,
-      'title': instance.title,
-      'type': _$SkuTypeEnumMap[instance.type]!,
-      'originalPrice': instance.originalPrice,
-      'originalPriceAmountMicros': instance.originalPriceAmountMicros,
-      'originalJson': instance.originalJson,
-    };
-
-const _$SkuTypeEnumMap = {
-  SkuType.inapp: 'inapp',
-  SkuType.subs: 'subs',
-};
diff --git a/lib/src/internal/mapper.dart b/lib/src/internal/mapper.dart
index 4e08312c..29031498 100644
--- a/lib/src/internal/mapper.dart
+++ b/lib/src/internal/mapper.dart
@@ -13,7 +13,6 @@ import '../dto/sk_product/sk_product_discount.dart';
 import '../dto/sk_product/sk_product.dart';
 import '../dto/sk_product/sk_payment_discount.dart';
 import '../dto/sk_product/subscription_period.dart';
-import '../dto/sku_details/sku_details.dart';
 import '../dto/product.dart';
 import '../dto/entitlement.dart';
 import '../dto/offerings.dart';
@@ -204,21 +203,6 @@ class QMapper {
     return SKPaymentDiscount.fromJson(map);
   }
 
-  // ignore: deprecated_member_use_from_same_package
-  static SkuDetailsWrapper? skuDetailsFromJson(dynamic json) {
-    if (json == null) return null;
-
-    final map = Map<String, dynamic>.from(json);
-
-    try {
-      // ignore: deprecated_member_use_from_same_package
-      return SkuDetailsWrapper.fromJson(map);
-    } catch (e) {
-      print('Could not parse SkuDetails: $e');
-      return null;
-    }
-  }
-
   static QEntitlementGrantType grantTypeFromNullableValue(String? value) {
     if (value == null) return QEntitlementGrantType.purchase;
 
diff --git a/lib/src/internal/nocodes_internal.dart b/lib/src/internal/nocodes_internal.dart
index f58c3d2b..443484e8 100644
--- a/lib/src/internal/nocodes_internal.dart
+++ b/lib/src/internal/nocodes_internal.dart
@@ -34,6 +34,7 @@ class NoCodesInternal implements NoCodes {
       Constants.kProjectKey: config.projectKey,
       Constants.kVersion: QonversionInternal.sdkVersion,
       Constants.kSource: Constants.sdkSource,
+      if (config.proxyUrl != null) Constants.kProxyUrl: config.proxyUrl,
     };
     _channel.invokeMethod(Constants.mInitializeNoCodes, args);
   }
diff --git a/lib/src/internal/qonversion_internal.dart b/lib/src/internal/qonversion_internal.dart
index 9e719506..e0b74618 100644
--- a/lib/src/internal/qonversion_internal.dart
+++ b/lib/src/internal/qonversion_internal.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:qonversion_flutter/qonversion_flutter.dart';
 import 'package:qonversion_flutter/src/internal/mapper.dart';
@@ -27,9 +26,9 @@ class QonversionInternal implements Qonversion {
 
     final args = {
       Constants.kProjectKey: config.projectKey,
-      Constants.kLaunchMode: StringUtils.capitalize(describeEnum(config.launchMode)),
-      Constants.kEnvironment: StringUtils.capitalize(describeEnum(config.environment)),
-      Constants.kEntitlementsCacheLifetime: StringUtils.capitalize(describeEnum(config.entitlementsCacheLifetime)),
+      Constants.kLaunchMode: StringUtils.capitalize(config.launchMode.name),
+      Constants.kEnvironment: StringUtils.capitalize(config.environment.name),
+      Constants.kEntitlementsCacheLifetime: StringUtils.capitalize(config.entitlementsCacheLifetime.name),
       Constants.kProxyUrl: config.proxyUrl,
       Constants.kKidsMode: config.kidsMode,
     };
@@ -120,7 +119,7 @@ class QonversionInternal implements Qonversion {
         Constants.kOfferId: purchaseOptions.offerId,
         Constants.kApplyOffer: purchaseOptions.applyOffer,
         Constants.kUpdatePolicyKey: updatePolicy != null
-            ? StringUtils.capitalize(describeEnum(updatePolicy))
+            ? StringUtils.capitalize(updatePolicy.name)
             : null,
         Constants.kPurchaseContextKeys: purchaseOptions.contextKeys,
         Constants.kPurchaseQuantity: purchaseOptions.quantity,
@@ -149,7 +148,7 @@ class QonversionInternal implements Qonversion {
         Constants.kApplyOffer: purchaseUpdateModel.applyOffer,
         Constants.kOldProductId: purchaseUpdateModel.oldProductId,
         Constants.kUpdatePolicyKey: updatePolicy != null
-            ? StringUtils.capitalize(describeEnum(updatePolicy))
+            ? StringUtils.capitalize(updatePolicy.name)
             : null,
       });
       final result = QMapper.entitlementsFromJson(rawResult);
@@ -324,7 +323,7 @@ class QonversionInternal implements Qonversion {
   Future<void> attribution(Map<dynamic, dynamic> data, QAttributionProvider provider) {
     final args = {
       Constants.kData: data,
-      Constants.kProvider: StringUtils.capitalize(describeEnum(provider)),
+      Constants.kProvider: StringUtils.capitalize(provider.name),
     };
 
     return _channel.invokeMethod(Constants.mAddAttributionData, args);
@@ -339,7 +338,7 @@ class QonversionInternal implements Qonversion {
     }
 
     _channel.invokeMethod(Constants.mSetDefinedUserProperty, {
-      Constants.kProperty: StringUtils.capitalize(describeEnum(property)),
+      Constants.kProperty: StringUtils.capitalize(property.name),
       Constants.kValue: value,
     });
   }
diff --git a/lib/src/nocodes_config.dart b/lib/src/nocodes_config.dart
index b36d3437..902eadfe 100644
--- a/lib/src/nocodes_config.dart
+++ b/lib/src/nocodes_config.dart
@@ -1,6 +1,7 @@
 /// Configuration for No-Codes initialization
 class NoCodesConfig {
   final String projectKey;
+  final String? proxyUrl;
 
-  const NoCodesConfig(this.projectKey);
+  const NoCodesConfig(this.projectKey, {this.proxyUrl});
 }
\ No newline at end of file
diff --git a/lib/src/nocodes_config_builder.dart b/lib/src/nocodes_config_builder.dart
index e39b7b78..4de89be0 100644
--- a/lib/src/nocodes_config_builder.dart
+++ b/lib/src/nocodes_config_builder.dart
@@ -3,13 +3,23 @@ import 'nocodes_config.dart';
 /// Builder for No-Codes configuration
 class NoCodesConfigBuilder {
   final String projectKey;
+  String? proxyUrl;
 
   NoCodesConfigBuilder(this.projectKey);
 
+  /// Set proxy URL for No-Codes initialization.
+  ///
+  /// [proxyUrl] the proxy URL to use.
+  /// Returns the builder instance for method chaining.
+  NoCodesConfigBuilder setProxyUrl(String? proxyUrl) {
+    this.proxyUrl = proxyUrl;
+    return this;
+  }
+
   /// Generate [NoCodesConfig] instance with all the provided configurations.
   ///
   /// Returns the complete [NoCodesConfig] instance.
   NoCodesConfig build() {
-    return NoCodesConfig(projectKey);
+    return NoCodesConfig(projectKey, proxyUrl: proxyUrl);
   }
 }
\ No newline at end of file
diff --git a/macos/Classes/FlutterError+Custom.swift b/macos/Classes/FlutterError+Custom.swift
index 64e8aff8..6f219418 100644
--- a/macos/Classes/FlutterError+Custom.swift
+++ b/macos/Classes/FlutterError+Custom.swift
@@ -29,13 +29,6 @@ extension FlutterError {
                                                details: "")
   
   private static func mapSandwichError(_ error: SandwichError, errorCode: String, errorMessage: String? = nil) -> FlutterError {
-    var message = ""
-    
-    if let errorMessage = errorMessage {
-      message = errorMessage + ". "
-    }
-    message += error.details
-    
     var details = "Qonversion Error Code: \(error.code)"
     
     if let additionalMessage = error.additionalMessage {
@@ -43,7 +36,7 @@ extension FlutterError {
     }
     
     return FlutterError(code: errorCode,
-                        message: message,
+                        message: error.details,
                         details: details)
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
index 9cf0e314..97276368 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.12.0"
+    version: "2.13.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -173,10 +173,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   file:
     dependency: transitive
     description:
@@ -279,10 +279,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.8"
+    version: "10.0.9"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -500,10 +500,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.1"
+    version: "15.0.0"
   watcher:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 5b1eb49f..82068493 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,8 +5,8 @@ homepage: 'https://qonversion.io'
 repository: 'https://github.com/qonversion/flutter-sdk'
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
-  flutter: ">=1.10.0"
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: ">=3.0.0"
 
 dependencies:
   flutter:
diff --git a/test/qonversion.dart b/test/qonversion.dart
index 0b44ceb8..8ea332ea 100644
--- a/test/qonversion.dart
+++ b/test/qonversion.dart
@@ -7,13 +7,15 @@ void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   setUp(() {
-    channel.setMockMethodCallHandler((MethodCall methodCall) async {
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, (MethodCall methodCall) async {
       return '42';
     });
   });
 
   tearDown(() {
-    channel.setMockMethodCallHandler(null);
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, null);
   });
 
   test('test', () async {});

From 6466c4d11c4d956af9f84691744b1236fcaa4f79 Mon Sep 17 00:00:00 2001
From: Surik <action@github.com>
Date: Thu, 20 Nov 2025 17:31:16 +0300
Subject: [PATCH 2/5] Added custom exception and few review fixes

---
 .gitignore                                |   6 +-
 android/build.gradle                      |   2 +-
 example/android/app/local.properties      |   8 -
 ios/Classes/FlutterError+Custom.swift     |   9 +-
 ios/qonversion_flutter.podspec            |   2 +-
 lib/qonversion_flutter.dart               |   1 +
 lib/src/dto/qonversion_exception.dart     |  27 ++
 lib/src/internal/nocodes_internal.dart    |  44 ++-
 lib/src/internal/qonversion_internal.dart | 355 +++++++++++++++-------
 macos/Classes/FlutterError+Custom.swift   |   9 +-
 pubspec.yaml                              |   2 +-
 11 files changed, 330 insertions(+), 135 deletions(-)
 delete mode 100644 example/android/app/local.properties
 create mode 100644 lib/src/dto/qonversion_exception.dart

diff --git a/.gitignore b/.gitignore
index f5267efa..abff9b8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,8 @@
 build/
 .idea
 
-lib/*.jar
\ No newline at end of file
+lib/*.jar
+
+# Local configuration files
+local.properties
+**/local.properties
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index 7db0153c..57019380 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -51,6 +51,6 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "io.qonversion:sandwich:7.0.0"
+    implementation "io.qonversion:sandwich:7.1.0"
     implementation 'com.google.code.gson:gson:2.9.0'
 }
diff --git a/example/android/app/local.properties b/example/android/app/local.properties
deleted file mode 100644
index 4c1719b6..00000000
--- a/example/android/app/local.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Mon Nov 10 16:23:11 MSK 2025
-sdk.dir=/Users/suriksarkisyan/Library/Android/sdk
diff --git a/ios/Classes/FlutterError+Custom.swift b/ios/Classes/FlutterError+Custom.swift
index 6f219418..64e8aff8 100644
--- a/ios/Classes/FlutterError+Custom.swift
+++ b/ios/Classes/FlutterError+Custom.swift
@@ -29,6 +29,13 @@ extension FlutterError {
                                                details: "")
   
   private static func mapSandwichError(_ error: SandwichError, errorCode: String, errorMessage: String? = nil) -> FlutterError {
+    var message = ""
+    
+    if let errorMessage = errorMessage {
+      message = errorMessage + ". "
+    }
+    message += error.details
+    
     var details = "Qonversion Error Code: \(error.code)"
     
     if let additionalMessage = error.additionalMessage {
@@ -36,7 +43,7 @@ extension FlutterError {
     }
     
     return FlutterError(code: errorCode,
-                        message: error.details,
+                        message: message,
                         details: details)
   }
 }
diff --git a/ios/qonversion_flutter.podspec b/ios/qonversion_flutter.podspec
index 03e51fb6..f8089356 100644
--- a/ios/qonversion_flutter.podspec
+++ b/ios/qonversion_flutter.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
   s.platform = :ios, '13.0'
-  s.dependency "QonversionSandwich", "7.0.0"
+  s.dependency "QonversionSandwich", "7.1.0"
 
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
diff --git a/lib/qonversion_flutter.dart b/lib/qonversion_flutter.dart
index 34ea5038..de4ec292 100644
--- a/lib/qonversion_flutter.dart
+++ b/lib/qonversion_flutter.dart
@@ -19,6 +19,7 @@ export 'src/dto/purchase_options_builder.dart';
 export 'src/dto/purchase_update_model.dart';
 export 'src/dto/purchase_update_policy.dart';
 export 'src/dto/purchase_exception.dart';
+export 'src/dto/qonversion_exception.dart';
 export 'src/dto/subscription_period.dart';
 export 'src/dto/qonversion_error.dart';
 export 'src/dto/qonversion_error_code.dart';
diff --git a/lib/src/dto/qonversion_exception.dart b/lib/src/dto/qonversion_exception.dart
new file mode 100644
index 00000000..4eae8ec2
--- /dev/null
+++ b/lib/src/dto/qonversion_exception.dart
@@ -0,0 +1,27 @@
+import 'qonversion_error_code.dart';
+
+/// General Qonversion exception for all non-purchase related errors
+class QonversionException implements Exception {
+  /// Qonversion Error Code
+  ///
+  /// See more in [documentation](https://documentation.qonversion.io/docs/handling-errors)
+  final String code;
+
+  /// Error description
+  final String message;
+
+  /// Additional error info
+  final String? details;
+
+  const QonversionException(
+    this.code,
+    this.message,
+    this.details,
+  );
+
+  @override
+  String toString() {
+    return 'QonversionException.\nCode: $code, Description: $message, Additional Message: $details';
+  }
+}
+
diff --git a/lib/src/internal/nocodes_internal.dart b/lib/src/internal/nocodes_internal.dart
index 443484e8..8f970735 100644
--- a/lib/src/internal/nocodes_internal.dart
+++ b/lib/src/internal/nocodes_internal.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:flutter/services.dart';
+import 'package:qonversion_flutter/src/dto/qonversion_exception.dart';
 import 'package:qonversion_flutter/src/internal/qonversion_internal.dart';
 import '../dto/nocodes_events.dart';
 import '../dto/presentation_config.dart';
@@ -36,7 +37,10 @@ class NoCodesInternal implements NoCodes {
       Constants.kSource: Constants.sdkSource,
       if (config.proxyUrl != null) Constants.kProxyUrl: config.proxyUrl,
     };
-    _channel.invokeMethod(Constants.mInitializeNoCodes, args);
+    // Initialize is fire-and-forget, errors will be handled in subsequent calls
+    _channel.invokeMethod(Constants.mInitializeNoCodes, args).catchError((error) {
+      // Silently ignore initialization errors
+    });
   }
 
   @override
@@ -132,11 +136,19 @@ class NoCodesInternal implements NoCodes {
       return;
     }
     
-    final args = {
-      Constants.kConfig: config.toMap(),
-      if (contextKey != null) Constants.kContextKey: contextKey,
-    };
-    await _channel.invokeMethod(Constants.mSetScreenPresentationConfig, args);
+    try {
+      final args = {
+        Constants.kConfig: config.toMap(),
+        if (contextKey != null) Constants.kContextKey: contextKey,
+      };
+      await _channel.invokeMethod(Constants.mSetScreenPresentationConfig, args);
+    } on PlatformException catch (e) {
+      throw QonversionException(
+        e.code,
+        e.message ?? "",
+        e.details,
+      );
+    }
   }
 
   @override
@@ -145,7 +157,15 @@ class NoCodesInternal implements NoCodes {
       return;
     }
     
-    await _channel.invokeMethod(Constants.mShowNoCodesScreen, {Constants.kContextKey: contextKey});
+    try {
+      await _channel.invokeMethod(Constants.mShowNoCodesScreen, {Constants.kContextKey: contextKey});
+    } on PlatformException catch (e) {
+      throw QonversionException(
+        e.code,
+        e.message ?? "",
+        e.details,
+      );
+    }
   }
 
   @override
@@ -154,6 +174,14 @@ class NoCodesInternal implements NoCodes {
       return;
     }
     
-    await _channel.invokeMethod(Constants.mCloseNoCodes);
+    try {
+      await _channel.invokeMethod(Constants.mCloseNoCodes);
+    } on PlatformException catch (e) {
+      throw QonversionException(
+        e.code,
+        e.message ?? "",
+        e.details,
+      );
+    }
   }
 }
\ No newline at end of file
diff --git a/lib/src/internal/qonversion_internal.dart b/lib/src/internal/qonversion_internal.dart
index e0b74618..6006b651 100644
--- a/lib/src/internal/qonversion_internal.dart
+++ b/lib/src/internal/qonversion_internal.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:flutter/services.dart';
 import 'package:qonversion_flutter/qonversion_flutter.dart';
+import 'package:qonversion_flutter/src/dto/qonversion_exception.dart';
 import 'package:qonversion_flutter/src/internal/mapper.dart';
 import 'package:qonversion_flutter/src/internal/utils/string.dart';
 
@@ -32,7 +33,9 @@ class QonversionInternal implements Qonversion {
       Constants.kProxyUrl: config.proxyUrl,
       Constants.kKidsMode: config.kidsMode,
     };
-    _channel.invokeMethod(Constants.mInitialize, args);
+    _channel.invokeMethod(Constants.mInitialize, args).catchError((error) {
+      // Silently ignore initialization errors
+    });
   }
 
   @override
@@ -52,12 +55,22 @@ class QonversionInternal implements Qonversion {
       _promoPurchasesEventChannel.receiveBroadcastStream().cast<String>();
 
   @override
-  Future<void> syncHistoricalData() => _channel.invokeMethod(Constants.mSyncHistoricalData);
+  Future<void> syncHistoricalData() async {
+    try {
+      return await _channel.invokeMethod(Constants.mSyncHistoricalData);
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
+  }
 
   @override
   Future<void> syncStoreKit2Purchases() async {
     if (Platform.isIOS) {
-      return _channel.invokeMethod(Constants.mSyncStoreKit2Purchases);
+      try {
+        return await _channel.invokeMethod(Constants.mSyncStoreKit2Purchases);
+      } on PlatformException catch (e) {
+        throw _convertPlatformException(e);
+      }
     }
   }
 
@@ -67,15 +80,19 @@ class QonversionInternal implements Qonversion {
       return null;
     }
 
-    final promotionalOfferJson = await _channel.invokeMethod(
-      Constants.mGetPromotionalOffer, {
-        Constants.kProductId: product.qonversionId,
-        Constants.kDiscountId: discount.identifier,
-      }
-    );
-
-    final result = QMapper.promotionalOfferFromJson(promotionalOfferJson);
-    return result;
+    try {
+      final promotionalOfferJson = await _channel.invokeMethod(
+        Constants.mGetPromotionalOffer, {
+          Constants.kProductId: product.qonversionId,
+          Constants.kDiscountId: discount.identifier,
+        }
+      );
+
+      final result = QMapper.promotionalOfferFromJson(promotionalOfferJson);
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   @override
@@ -160,100 +177,146 @@ class QonversionInternal implements Qonversion {
 
   @override
   Future<Map<String, QProduct>> products() async {
-    final rawResult = await _channel.invokeMethod(Constants.mProducts);
+    try {
+      final rawResult = await _channel.invokeMethod(Constants.mProducts);
 
-    final result = QMapper.productsFromJson(rawResult);
-    return result;
+      final result = QMapper.productsFromJson(rawResult);
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   @override
   Future<QOfferings> offerings() async {
-    final offeringsString = await _channel.invokeMethod<String>(Constants.mOfferings);
+    try {
+      final offeringsString = await _channel.invokeMethod<String>(Constants.mOfferings);
 
-    final result = QMapper.offeringsFromJson(offeringsString);
-    return result;
+      final result = QMapper.offeringsFromJson(offeringsString);
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   @override
   Future<Map<String, QEligibility>> checkTrialIntroEligibility(List<String> ids) async {
-    final eligibilitiesString = await _channel.invokeMethod<String>(
-        Constants.mCheckTrialIntroEligibility, {"ids": ids});
+    try {
+      final eligibilitiesString = await _channel.invokeMethod<String>(
+          Constants.mCheckTrialIntroEligibility, {"ids": ids});
 
-    final result = QMapper.eligibilityFromJson(eligibilitiesString);
-    return result;
+      final result = QMapper.eligibilityFromJson(eligibilitiesString);
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   @override
   Future<Map<String, QEntitlement>> checkEntitlements() async {
-    final rawResult = await _channel.invokeMethod(Constants.mCheckEntitlements);
+    try {
+      final rawResult = await _channel.invokeMethod(Constants.mCheckEntitlements);
 
-    final result = QMapper.entitlementsFromJson(rawResult);
-    return result;
+      final result = QMapper.entitlementsFromJson(rawResult);
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   @override
   Future<Map<String, QEntitlement>> restore() async {
-    final rawResult = await _channel.invokeMethod(Constants.mRestore);
+    try {
+      final rawResult = await _channel.invokeMethod(Constants.mRestore);
 
-    final result = QMapper.entitlementsFromJson(rawResult);
-    return result;
+      final result = QMapper.entitlementsFromJson(rawResult);
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   @override
   Future<void> syncPurchases() async {
     if (Platform.isAndroid) {
-      return _channel.invokeMethod(Constants.mSyncPurchases);
+      try {
+        return await _channel.invokeMethod(Constants.mSyncPurchases);
+      } on PlatformException catch (e) {
+        throw _convertPlatformException(e);
+      }
     }
   }
 
   @override
   Future<QUser> identify(String userId) async {
-    final rawResult = await _channel.invokeMethod(Constants.mIdentify, {Constants.kUserId: userId});
+    try {
+      final rawResult = await _channel.invokeMethod(Constants.mIdentify, {Constants.kUserId: userId});
 
-    final result = QMapper.userFromJson(rawResult);
-    if (result == null) {
-      throw new Exception("User deserialization failed");
+      final result = QMapper.userFromJson(rawResult);
+      if (result == null) {
+        throw new Exception("User deserialization failed");
+      }
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
     }
-    return result;
   }
 
   @override
-  Future<void> logout() => _channel.invokeMethod(Constants.mLogout);
+  Future<void> logout() async {
+    try {
+      return await _channel.invokeMethod(Constants.mLogout);
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
+  }
 
   @override
   Future<QUser> userInfo() async {
-    final rawResult = await _channel.invokeMethod(Constants.mUserInfo);
+    try {
+      final rawResult = await _channel.invokeMethod(Constants.mUserInfo);
 
-    final result = QMapper.userFromJson(rawResult);
-    if (result == null) {
-      throw new Exception("User deserialization failed");
+      final result = QMapper.userFromJson(rawResult);
+      if (result == null) {
+        throw new Exception("User deserialization failed");
+      }
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
     }
-    return result;
   }
 
   @override
   Future<QRemoteConfig> remoteConfig({String? contextKey}) async {
-    final args = {
-      Constants.kContextKey: contextKey,
-    };
-    final rawResult = await _channel.invokeMethod(Constants.mRemoteConfig, args);
-
-    final result = QMapper.remoteConfigFromJson(rawResult);
-    if (result == null) {
-      throw new Exception("Remote config deserialization failed");
+    try {
+      final args = {
+        Constants.kContextKey: contextKey,
+      };
+      final rawResult = await _channel.invokeMethod(Constants.mRemoteConfig, args);
+
+      final result = QMapper.remoteConfigFromJson(rawResult);
+      if (result == null) {
+        throw new Exception("Remote config deserialization failed");
+      }
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
     }
-    return result;
   }
 
   @override
   Future<QRemoteConfigList> remoteConfigList() async {
-    final rawResult = await _channel.invokeMethod(Constants.mRemoteConfigList);
+    try {
+      final rawResult = await _channel.invokeMethod(Constants.mRemoteConfigList);
 
-    final result = QMapper.remoteConfigListFromJson(rawResult);
-    if (result == null) {
-      throw new Exception("Remote config list deserialization failed");
+      final result = QMapper.remoteConfigListFromJson(rawResult);
+      if (result == null) {
+        throw new Exception("Remote config list deserialization failed");
+      }
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
     }
-    return result;
   }
 
   @override
@@ -261,72 +324,100 @@ class QonversionInternal implements Qonversion {
       List<String> contextKeys,
       bool includeEmptyContextKey
   ) async {
-    final args = {
-      Constants.kContextKeys: contextKeys,
-      Constants.kIncludeEmptyContextKey: includeEmptyContextKey,
-    };
-    final rawResult = await _channel.invokeMethod(Constants.mRemoteConfigListForContextKeys, args);
-
-    final result = QMapper.remoteConfigListFromJson(rawResult);
-    if (result == null) {
-      throw new Exception("Remote config list deserialization failed");
+    try {
+      final args = {
+        Constants.kContextKeys: contextKeys,
+        Constants.kIncludeEmptyContextKey: includeEmptyContextKey,
+      };
+      final rawResult = await _channel.invokeMethod(Constants.mRemoteConfigListForContextKeys, args);
+
+      final result = QMapper.remoteConfigListFromJson(rawResult);
+      if (result == null) {
+        throw new Exception("Remote config list deserialization failed");
+      }
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
     }
-    return result;
   }
 
   @override
   Future<void> attachUserToExperiment(String experimentId, String groupId) async {
-    final args = {
-      Constants.kExperimentId: experimentId,
-      Constants.kGroupId: groupId,
-    };
-    await _channel.invokeMethod(Constants.mAttachUserToExperiment, args);
-    return;
+    try {
+      final args = {
+        Constants.kExperimentId: experimentId,
+        Constants.kGroupId: groupId,
+      };
+      await _channel.invokeMethod(Constants.mAttachUserToExperiment, args);
+      return;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   @override
   Future<void> detachUserFromExperiment(String experimentId) async {
-    final args = {
-      Constants.kExperimentId: experimentId,
-    };
-    await _channel.invokeMethod(Constants.mDetachUserFromExperiment, args);
-    return;
+    try {
+      final args = {
+        Constants.kExperimentId: experimentId,
+      };
+      await _channel.invokeMethod(Constants.mDetachUserFromExperiment, args);
+      return;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   Future<void> attachUserToRemoteConfiguration(String remoteConfigurationId) async {
-    final args = {
-      Constants.kRemoteConfigurationId: remoteConfigurationId,
-    };
-    await _channel.invokeMethod(Constants.mAttachUserToRemoteConfiguration, args);
-    return;
+    try {
+      final args = {
+        Constants.kRemoteConfigurationId: remoteConfigurationId,
+      };
+      await _channel.invokeMethod(Constants.mAttachUserToRemoteConfiguration, args);
+      return;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   Future<void> detachUserFromRemoteConfiguration(String remoteConfigurationId) async {
-    final args = {
-      Constants.kRemoteConfigurationId: remoteConfigurationId,
-    };
-    await _channel.invokeMethod(Constants.mDetachUserFromRemoteConfiguration, args);
-    return;
+    try {
+      final args = {
+        Constants.kRemoteConfigurationId: remoteConfigurationId,
+      };
+      await _channel.invokeMethod(Constants.mDetachUserFromRemoteConfiguration, args);
+      return;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   Future<bool> isFallbackFileAccessible() async {
-    final rawResult = await _channel.invokeMethod(Constants.mIsFallbackFileAccessible);
-    final result = QMapper.mapIsFallbackFileAccessible(rawResult);
-    if (result == null) {
-      return false;
-    }
+    try {
+      final rawResult = await _channel.invokeMethod(Constants.mIsFallbackFileAccessible);
+      final result = QMapper.mapIsFallbackFileAccessible(rawResult);
+      if (result == null) {
+        return false;
+      }
 
-    return result;
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   @override
-  Future<void> attribution(Map<dynamic, dynamic> data, QAttributionProvider provider) {
-    final args = {
-      Constants.kData: data,
-      Constants.kProvider: StringUtils.capitalize(provider.name),
-    };
+  Future<void> attribution(Map<dynamic, dynamic> data, QAttributionProvider provider) async {
+    try {
+      final args = {
+        Constants.kData: data,
+        Constants.kProvider: StringUtils.capitalize(provider.name),
+      };
 
-    return _channel.invokeMethod(Constants.mAddAttributionData, args);
+      return await _channel.invokeMethod(Constants.mAddAttributionData, args);
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   @override
@@ -337,48 +428,73 @@ class QonversionInternal implements Qonversion {
       return;
     }
 
-    _channel.invokeMethod(Constants.mSetDefinedUserProperty, {
-      Constants.kProperty: StringUtils.capitalize(property.name),
-      Constants.kValue: value,
-    });
+    try {
+      await _channel.invokeMethod(Constants.mSetDefinedUserProperty, {
+        Constants.kProperty: StringUtils.capitalize(property.name),
+        Constants.kValue: value,
+      });
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
   }
 
   @override
-  Future<void> setCustomUserProperty(String property, String value) =>
-      _channel.invokeMethod(Constants.mSetCustomUserProperty, {
+  Future<void> setCustomUserProperty(String property, String value) async {
+    try {
+      return await _channel.invokeMethod(Constants.mSetCustomUserProperty, {
         Constants.kProperty: property,
         Constants.kValue: value,
       });
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
+  }
 
   @override
   Future<QUserProperties> userProperties() async {
-    final rawResult = await _channel.invokeMethod(Constants.mUserProperties);
+    try {
+      final rawResult = await _channel.invokeMethod(Constants.mUserProperties);
 
-    final result = QMapper.userPropertiesFromJson(rawResult);
-    if (result == null) {
-      throw new Exception("User properties deserialization failed");
+      final result = QMapper.userPropertiesFromJson(rawResult);
+      if (result == null) {
+        throw new Exception("User properties deserialization failed");
+      }
+      return result;
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
     }
-    return result;
   }
 
   @override
   Future<void> collectAdvertisingId() async {
     if (Platform.isIOS) {
-      return _channel.invokeMethod(Constants.mCollectAdvertisingId);
+      try {
+        return await _channel.invokeMethod(Constants.mCollectAdvertisingId);
+      } on PlatformException catch (e) {
+        throw _convertPlatformException(e);
+      }
     }
   }
 
   @override
   Future<void> collectAppleSearchAdsAttribution() async {
     if (Platform.isIOS) {
-      return _channel.invokeMethod(Constants.mCollectAppleSearchAdsAttribution);
+      try {
+        return await _channel.invokeMethod(Constants.mCollectAppleSearchAdsAttribution);
+      } on PlatformException catch (e) {
+        throw _convertPlatformException(e);
+      }
     }
   }
 
   @override
   Future<void> presentCodeRedemptionSheet() async {
     if (Platform.isIOS) {
-      return _channel.invokeMethod(Constants.mPresentCodeRedemptionSheet);
+      try {
+        return await _channel.invokeMethod(Constants.mPresentCodeRedemptionSheet);
+      } on PlatformException catch (e) {
+        throw _convertPlatformException(e);
+      }
     }
   }
 
@@ -399,11 +515,16 @@ class QonversionInternal implements Qonversion {
   }
 
   // Private methods
-  Future<void> _storeSdkInfo() =>
-      _channel.invokeMethod(Constants.mStoreSdkInfo, {
+  Future<void> _storeSdkInfo() async {
+    try {
+      await _channel.invokeMethod(Constants.mStoreSdkInfo, {
         Constants.kVersion: sdkVersion,
         Constants.kSource: Constants.sdkSource,
       });
+    } on PlatformException catch (e) {
+      // Silently ignore errors in SDK info storage
+    }
+  }
 
   static QPurchaseException _convertPurchaseException(PlatformException error) {
     return QPurchaseException(
@@ -413,4 +534,12 @@ class QonversionInternal implements Qonversion {
         isUserCancelled: error.code == QErrorCode.purchaseCanceled.code
     );
   }
+
+  static QonversionException _convertPlatformException(PlatformException error) {
+    return QonversionException(
+        error.code,
+        error.message ?? "",
+        error.details,
+    );
+  }
 }
diff --git a/macos/Classes/FlutterError+Custom.swift b/macos/Classes/FlutterError+Custom.swift
index 6f219418..64e8aff8 100644
--- a/macos/Classes/FlutterError+Custom.swift
+++ b/macos/Classes/FlutterError+Custom.swift
@@ -29,6 +29,13 @@ extension FlutterError {
                                                details: "")
   
   private static func mapSandwichError(_ error: SandwichError, errorCode: String, errorMessage: String? = nil) -> FlutterError {
+    var message = ""
+    
+    if let errorMessage = errorMessage {
+      message = errorMessage + ". "
+    }
+    message += error.details
+    
     var details = "Qonversion Error Code: \(error.code)"
     
     if let additionalMessage = error.additionalMessage {
@@ -36,7 +43,7 @@ extension FlutterError {
     }
     
     return FlutterError(code: errorCode,
-                        message: error.details,
+                        message: message,
                         details: details)
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 82068493..47776fd4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: 'https://qonversion.io'
 repository: 'https://github.com/qonversion/flutter-sdk'
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=2.15.0 <4.0.0'
   flutter: ">=3.0.0"
 
 dependencies:

From 99e7a977773a2d946da937d5b3b5d5d1f060ec80 Mon Sep 17 00:00:00 2001
From: Surik <action@github.com>
Date: Fri, 21 Nov 2025 16:15:39 +0300
Subject: [PATCH 3/5] Review fixes

---
 lib/src/internal/nocodes_internal.dart    |  35 +-
 lib/src/internal/qonversion_internal.dart | 470 +++++++++-------------
 2 files changed, 192 insertions(+), 313 deletions(-)

diff --git a/lib/src/internal/nocodes_internal.dart b/lib/src/internal/nocodes_internal.dart
index 8f970735..76839945 100644
--- a/lib/src/internal/nocodes_internal.dart
+++ b/lib/src/internal/nocodes_internal.dart
@@ -136,19 +136,11 @@ class NoCodesInternal implements NoCodes {
       return;
     }
     
-    try {
-      final args = {
-        Constants.kConfig: config.toMap(),
-        if (contextKey != null) Constants.kContextKey: contextKey,
-      };
-      await _channel.invokeMethod(Constants.mSetScreenPresentationConfig, args);
-    } on PlatformException catch (e) {
-      throw QonversionException(
-        e.code,
-        e.message ?? "",
-        e.details,
-      );
-    }
+    final args = {
+      Constants.kConfig: config.toMap(),
+      if (contextKey != null) Constants.kContextKey: contextKey,
+    };
+    await _invokeMethod(Constants.mSetScreenPresentationConfig, args);
   }
 
   @override
@@ -157,15 +149,7 @@ class NoCodesInternal implements NoCodes {
       return;
     }
     
-    try {
-      await _channel.invokeMethod(Constants.mShowNoCodesScreen, {Constants.kContextKey: contextKey});
-    } on PlatformException catch (e) {
-      throw QonversionException(
-        e.code,
-        e.message ?? "",
-        e.details,
-      );
-    }
+    await _invokeMethod(Constants.mShowNoCodesScreen, {Constants.kContextKey: contextKey});
   }
 
   @override
@@ -174,8 +158,13 @@ class NoCodesInternal implements NoCodes {
       return;
     }
     
+    await _invokeMethod(Constants.mCloseNoCodes);
+  }
+
+  /// Invokes a method on the platform channel and converts PlatformException to QonversionException
+  Future<dynamic> _invokeMethod(String method, [Map<String, dynamic>? arguments]) async {
     try {
-      await _channel.invokeMethod(Constants.mCloseNoCodes);
+      return await _channel.invokeMethod(method, arguments);
     } on PlatformException catch (e) {
       throw QonversionException(
         e.code,
diff --git a/lib/src/internal/qonversion_internal.dart b/lib/src/internal/qonversion_internal.dart
index 6006b651..ae74ce5d 100644
--- a/lib/src/internal/qonversion_internal.dart
+++ b/lib/src/internal/qonversion_internal.dart
@@ -33,6 +33,7 @@ class QonversionInternal implements Qonversion {
       Constants.kProxyUrl: config.proxyUrl,
       Constants.kKidsMode: config.kidsMode,
     };
+    // Initialize is fire-and-forget, errors will be handled in subsequent calls
     _channel.invokeMethod(Constants.mInitialize, args).catchError((error) {
       // Silently ignore initialization errors
     });
@@ -56,21 +57,13 @@ class QonversionInternal implements Qonversion {
 
   @override
   Future<void> syncHistoricalData() async {
-    try {
-      return await _channel.invokeMethod(Constants.mSyncHistoricalData);
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    return await _invokeMethod(Constants.mSyncHistoricalData);
   }
 
   @override
   Future<void> syncStoreKit2Purchases() async {
     if (Platform.isIOS) {
-      try {
-        return await _channel.invokeMethod(Constants.mSyncStoreKit2Purchases);
-      } on PlatformException catch (e) {
-        throw _convertPlatformException(e);
-      }
+      return await _invokeMethod(Constants.mSyncStoreKit2Purchases);
     }
   }
 
@@ -80,74 +73,60 @@ class QonversionInternal implements Qonversion {
       return null;
     }
 
-    try {
-      final promotionalOfferJson = await _channel.invokeMethod(
-        Constants.mGetPromotionalOffer, {
-          Constants.kProductId: product.qonversionId,
-          Constants.kDiscountId: discount.identifier,
-        }
-      );
-
-      final result = QMapper.promotionalOfferFromJson(promotionalOfferJson);
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    final promotionalOfferJson = await _invokeMethod(
+      Constants.mGetPromotionalOffer, {
+        Constants.kProductId: product.qonversionId,
+        Constants.kDiscountId: discount.identifier,
+      }
+    );
+
+    final result = QMapper.promotionalOfferFromJson(promotionalOfferJson);
+    return result;
   }
 
   @override
   Future<Map<String, QEntitlement>> purchase(QPurchaseModel purchaseModel) async {
-    try {
-      final rawResult = await _channel
-          .invokeMethod(Constants.mPurchase, {
-            Constants.kProductId: purchaseModel.productId,
-            Constants.kOfferId: purchaseModel.offerId,
-            Constants.kApplyOffer: purchaseModel.applyOffer
-          });
-
-      final result = QMapper.entitlementsFromJson(rawResult);
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPurchaseException(e);
-    }
+    final rawResult = await _invokePurchaseMethod(Constants.mPurchase, {
+      Constants.kProductId: purchaseModel.productId,
+      Constants.kOfferId: purchaseModel.offerId,
+      Constants.kApplyOffer: purchaseModel.applyOffer
+    });
+
+    final result = QMapper.entitlementsFromJson(rawResult);
+    return result;
   }
 
   @override
   Future<Map<String, QEntitlement>> purchaseProduct(QProduct product, {QPurchaseOptions? purchaseOptions}) async {
-    try {
-      if (purchaseOptions == null) {
-        purchaseOptions = new QPurchaseOptionsBuilder().build();
-      }
-
-      final Map<String, dynamic> promoOfferData = new Map<String, dynamic>();
-      if (purchaseOptions.promotionalOffer != null) {
-        promoOfferData['productDiscountId'] = purchaseOptions.promotionalOffer?.productDiscount.identifier;
-        promoOfferData['keyIdentifier'] = purchaseOptions.promotionalOffer?.paymentDiscount.keyIdentifier;
-        promoOfferData['nonce'] = purchaseOptions.promotionalOffer?.paymentDiscount.nonce;
-        promoOfferData['signature'] = purchaseOptions.promotionalOffer?.paymentDiscount.signature;
-        promoOfferData['timestamp'] = purchaseOptions.promotionalOffer?.paymentDiscount.timestamp;
-      }
-
-      final updatePolicy = purchaseOptions.updatePolicy;
-      final rawResult = await _channel
-          .invokeMethod(Constants.mPurchase, {
-        Constants.kProductId: product.qonversionId,
-        Constants.kOldProductId: purchaseOptions.oldProduct?.qonversionId,
-        Constants.kOfferId: purchaseOptions.offerId,
-        Constants.kApplyOffer: purchaseOptions.applyOffer,
-        Constants.kUpdatePolicyKey: updatePolicy != null
-            ? StringUtils.capitalize(updatePolicy.name)
-            : null,
-        Constants.kPurchaseContextKeys: purchaseOptions.contextKeys,
-        Constants.kPurchaseQuantity: purchaseOptions.quantity,
-        Constants.kPromoOffer: promoOfferData,
-      });
+    if (purchaseOptions == null) {
+      purchaseOptions = new QPurchaseOptionsBuilder().build();
+    }
+
+    final Map<String, dynamic> promoOfferData = new Map<String, dynamic>();
+    if (purchaseOptions.promotionalOffer != null) {
+      promoOfferData['productDiscountId'] = purchaseOptions.promotionalOffer?.productDiscount.identifier;
+      promoOfferData['keyIdentifier'] = purchaseOptions.promotionalOffer?.paymentDiscount.keyIdentifier;
+      promoOfferData['nonce'] = purchaseOptions.promotionalOffer?.paymentDiscount.nonce;
+      promoOfferData['signature'] = purchaseOptions.promotionalOffer?.paymentDiscount.signature;
+      promoOfferData['timestamp'] = purchaseOptions.promotionalOffer?.paymentDiscount.timestamp;
+    }
+
+    final updatePolicy = purchaseOptions.updatePolicy;
+    final rawResult = await _invokePurchaseMethod(Constants.mPurchase, {
+      Constants.kProductId: product.qonversionId,
+      Constants.kOldProductId: purchaseOptions.oldProduct?.qonversionId,
+      Constants.kOfferId: purchaseOptions.offerId,
+      Constants.kApplyOffer: purchaseOptions.applyOffer,
+      Constants.kUpdatePolicyKey: updatePolicy != null
+          ? StringUtils.capitalize(updatePolicy.name)
+          : null,
+      Constants.kPurchaseContextKeys: purchaseOptions.contextKeys,
+      Constants.kPurchaseQuantity: purchaseOptions.quantity,
+      Constants.kPromoOffer: promoOfferData,
+    });
 
-      final result = QMapper.entitlementsFromJson(rawResult);
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPurchaseException(e);
-    }
+    final result = QMapper.entitlementsFromJson(rawResult);
+    return result;
   }
 
   @override
@@ -156,167 +135,119 @@ class QonversionInternal implements Qonversion {
       return null;
     }
 
-    try {
-      final updatePolicy = purchaseUpdateModel.updatePolicy;
-
-      final rawResult = await _channel.invokeMethod(Constants.mUpdatePurchase, {
-        Constants.kProductId: purchaseUpdateModel.productId,
-        Constants.kOfferId: purchaseUpdateModel.offerId,
-        Constants.kApplyOffer: purchaseUpdateModel.applyOffer,
-        Constants.kOldProductId: purchaseUpdateModel.oldProductId,
-        Constants.kUpdatePolicyKey: updatePolicy != null
-            ? StringUtils.capitalize(updatePolicy.name)
-            : null,
-      });
-      final result = QMapper.entitlementsFromJson(rawResult);
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPurchaseException(e);
-    }
+    final updatePolicy = purchaseUpdateModel.updatePolicy;
+
+    final rawResult = await _invokePurchaseMethod(Constants.mUpdatePurchase, {
+      Constants.kProductId: purchaseUpdateModel.productId,
+      Constants.kOfferId: purchaseUpdateModel.offerId,
+      Constants.kApplyOffer: purchaseUpdateModel.applyOffer,
+      Constants.kOldProductId: purchaseUpdateModel.oldProductId,
+      Constants.kUpdatePolicyKey: updatePolicy != null
+          ? StringUtils.capitalize(updatePolicy.name)
+          : null,
+    });
+    final result = QMapper.entitlementsFromJson(rawResult);
+    return result;
   }
 
   @override
   Future<Map<String, QProduct>> products() async {
-    try {
-      final rawResult = await _channel.invokeMethod(Constants.mProducts);
+    final rawResult = await _invokeMethod(Constants.mProducts);
 
-      final result = QMapper.productsFromJson(rawResult);
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    final result = QMapper.productsFromJson(rawResult);
+    return result;
   }
 
   @override
   Future<QOfferings> offerings() async {
-    try {
-      final offeringsString = await _channel.invokeMethod<String>(Constants.mOfferings);
+    final offeringsString = await _invokeMethod(Constants.mOfferings) as String;
 
-      final result = QMapper.offeringsFromJson(offeringsString);
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    final result = QMapper.offeringsFromJson(offeringsString);
+    return result;
   }
 
   @override
   Future<Map<String, QEligibility>> checkTrialIntroEligibility(List<String> ids) async {
-    try {
-      final eligibilitiesString = await _channel.invokeMethod<String>(
-          Constants.mCheckTrialIntroEligibility, {"ids": ids});
+    final eligibilitiesString = await _invokeMethod(
+        Constants.mCheckTrialIntroEligibility, {"ids": ids}) as String;
 
-      final result = QMapper.eligibilityFromJson(eligibilitiesString);
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    final result = QMapper.eligibilityFromJson(eligibilitiesString);
+    return result;
   }
 
   @override
   Future<Map<String, QEntitlement>> checkEntitlements() async {
-    try {
-      final rawResult = await _channel.invokeMethod(Constants.mCheckEntitlements);
+    final rawResult = await _invokeMethod(Constants.mCheckEntitlements);
 
-      final result = QMapper.entitlementsFromJson(rawResult);
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    final result = QMapper.entitlementsFromJson(rawResult);
+    return result;
   }
 
   @override
   Future<Map<String, QEntitlement>> restore() async {
-    try {
-      final rawResult = await _channel.invokeMethod(Constants.mRestore);
+    final rawResult = await _invokeMethod(Constants.mRestore);
 
-      final result = QMapper.entitlementsFromJson(rawResult);
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    final result = QMapper.entitlementsFromJson(rawResult);
+    return result;
   }
 
   @override
   Future<void> syncPurchases() async {
     if (Platform.isAndroid) {
-      try {
-        return await _channel.invokeMethod(Constants.mSyncPurchases);
-      } on PlatformException catch (e) {
-        throw _convertPlatformException(e);
-      }
+      return await _invokeMethod(Constants.mSyncPurchases);
     }
   }
 
   @override
   Future<QUser> identify(String userId) async {
-    try {
-      final rawResult = await _channel.invokeMethod(Constants.mIdentify, {Constants.kUserId: userId});
+    final rawResult = await _invokeMethod(Constants.mIdentify, {Constants.kUserId: userId});
 
-      final result = QMapper.userFromJson(rawResult);
-      if (result == null) {
-        throw new Exception("User deserialization failed");
-      }
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
+    final result = QMapper.userFromJson(rawResult);
+    if (result == null) {
+      throw new Exception("User deserialization failed");
     }
+    return result;
   }
 
   @override
   Future<void> logout() async {
-    try {
-      return await _channel.invokeMethod(Constants.mLogout);
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    return await _invokeMethod(Constants.mLogout);
   }
 
   @override
   Future<QUser> userInfo() async {
-    try {
-      final rawResult = await _channel.invokeMethod(Constants.mUserInfo);
+    final rawResult = await _invokeMethod(Constants.mUserInfo);
 
-      final result = QMapper.userFromJson(rawResult);
-      if (result == null) {
-        throw new Exception("User deserialization failed");
-      }
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
+    final result = QMapper.userFromJson(rawResult);
+    if (result == null) {
+      throw new Exception("User deserialization failed");
     }
+    return result;
   }
 
   @override
   Future<QRemoteConfig> remoteConfig({String? contextKey}) async {
-    try {
-      final args = {
-        Constants.kContextKey: contextKey,
-      };
-      final rawResult = await _channel.invokeMethod(Constants.mRemoteConfig, args);
-
-      final result = QMapper.remoteConfigFromJson(rawResult);
-      if (result == null) {
-        throw new Exception("Remote config deserialization failed");
-      }
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
+    final args = {
+      Constants.kContextKey: contextKey,
+    };
+    final rawResult = await _invokeMethod(Constants.mRemoteConfig, args);
+
+    final result = QMapper.remoteConfigFromJson(rawResult);
+    if (result == null) {
+      throw new Exception("Remote config deserialization failed");
     }
+    return result;
   }
 
   @override
   Future<QRemoteConfigList> remoteConfigList() async {
-    try {
-      final rawResult = await _channel.invokeMethod(Constants.mRemoteConfigList);
+    final rawResult = await _invokeMethod(Constants.mRemoteConfigList);
 
-      final result = QMapper.remoteConfigListFromJson(rawResult);
-      if (result == null) {
-        throw new Exception("Remote config list deserialization failed");
-      }
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
+    final result = QMapper.remoteConfigListFromJson(rawResult);
+    if (result == null) {
+      throw new Exception("Remote config list deserialization failed");
     }
+    return result;
   }
 
   @override
@@ -324,100 +255,68 @@ class QonversionInternal implements Qonversion {
       List<String> contextKeys,
       bool includeEmptyContextKey
   ) async {
-    try {
-      final args = {
-        Constants.kContextKeys: contextKeys,
-        Constants.kIncludeEmptyContextKey: includeEmptyContextKey,
-      };
-      final rawResult = await _channel.invokeMethod(Constants.mRemoteConfigListForContextKeys, args);
-
-      final result = QMapper.remoteConfigListFromJson(rawResult);
-      if (result == null) {
-        throw new Exception("Remote config list deserialization failed");
-      }
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
+    final args = {
+      Constants.kContextKeys: contextKeys,
+      Constants.kIncludeEmptyContextKey: includeEmptyContextKey,
+    };
+    final rawResult = await _invokeMethod(Constants.mRemoteConfigListForContextKeys, args);
+
+    final result = QMapper.remoteConfigListFromJson(rawResult);
+    if (result == null) {
+      throw new Exception("Remote config list deserialization failed");
     }
+    return result;
   }
 
   @override
   Future<void> attachUserToExperiment(String experimentId, String groupId) async {
-    try {
-      final args = {
-        Constants.kExperimentId: experimentId,
-        Constants.kGroupId: groupId,
-      };
-      await _channel.invokeMethod(Constants.mAttachUserToExperiment, args);
-      return;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    final args = {
+      Constants.kExperimentId: experimentId,
+      Constants.kGroupId: groupId,
+    };
+    await _invokeMethod(Constants.mAttachUserToExperiment, args);
   }
 
   @override
   Future<void> detachUserFromExperiment(String experimentId) async {
-    try {
-      final args = {
-        Constants.kExperimentId: experimentId,
-      };
-      await _channel.invokeMethod(Constants.mDetachUserFromExperiment, args);
-      return;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    final args = {
+      Constants.kExperimentId: experimentId,
+    };
+    await _invokeMethod(Constants.mDetachUserFromExperiment, args);
   }
 
   Future<void> attachUserToRemoteConfiguration(String remoteConfigurationId) async {
-    try {
-      final args = {
-        Constants.kRemoteConfigurationId: remoteConfigurationId,
-      };
-      await _channel.invokeMethod(Constants.mAttachUserToRemoteConfiguration, args);
-      return;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    final args = {
+      Constants.kRemoteConfigurationId: remoteConfigurationId,
+    };
+    await _invokeMethod(Constants.mAttachUserToRemoteConfiguration, args);
   }
 
   Future<void> detachUserFromRemoteConfiguration(String remoteConfigurationId) async {
-    try {
-      final args = {
-        Constants.kRemoteConfigurationId: remoteConfigurationId,
-      };
-      await _channel.invokeMethod(Constants.mDetachUserFromRemoteConfiguration, args);
-      return;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    final args = {
+      Constants.kRemoteConfigurationId: remoteConfigurationId,
+    };
+    await _invokeMethod(Constants.mDetachUserFromRemoteConfiguration, args);
   }
 
   Future<bool> isFallbackFileAccessible() async {
-    try {
-      final rawResult = await _channel.invokeMethod(Constants.mIsFallbackFileAccessible);
-      final result = QMapper.mapIsFallbackFileAccessible(rawResult);
-      if (result == null) {
-        return false;
-      }
-
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
+    final rawResult = await _invokeMethod(Constants.mIsFallbackFileAccessible);
+    final result = QMapper.mapIsFallbackFileAccessible(rawResult);
+    if (result == null) {
+      return false;
     }
+
+    return result;
   }
 
   @override
   Future<void> attribution(Map<dynamic, dynamic> data, QAttributionProvider provider) async {
-    try {
-      final args = {
-        Constants.kData: data,
-        Constants.kProvider: StringUtils.capitalize(provider.name),
-      };
+    final args = {
+      Constants.kData: data,
+      Constants.kProvider: StringUtils.capitalize(provider.name),
+    };
 
-      return await _channel.invokeMethod(Constants.mAddAttributionData, args);
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    return await _invokeMethod(Constants.mAddAttributionData, args);
   }
 
   @override
@@ -428,73 +327,49 @@ class QonversionInternal implements Qonversion {
       return;
     }
 
-    try {
-      await _channel.invokeMethod(Constants.mSetDefinedUserProperty, {
-        Constants.kProperty: StringUtils.capitalize(property.name),
-        Constants.kValue: value,
-      });
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    await _invokeMethod(Constants.mSetDefinedUserProperty, {
+      Constants.kProperty: StringUtils.capitalize(property.name),
+      Constants.kValue: value,
+    });
   }
 
   @override
   Future<void> setCustomUserProperty(String property, String value) async {
-    try {
-      return await _channel.invokeMethod(Constants.mSetCustomUserProperty, {
-        Constants.kProperty: property,
-        Constants.kValue: value,
-      });
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
-    }
+    return await _invokeMethod(Constants.mSetCustomUserProperty, {
+      Constants.kProperty: property,
+      Constants.kValue: value,
+    });
   }
 
   @override
   Future<QUserProperties> userProperties() async {
-    try {
-      final rawResult = await _channel.invokeMethod(Constants.mUserProperties);
+    final rawResult = await _invokeMethod(Constants.mUserProperties);
 
-      final result = QMapper.userPropertiesFromJson(rawResult);
-      if (result == null) {
-        throw new Exception("User properties deserialization failed");
-      }
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPlatformException(e);
+    final result = QMapper.userPropertiesFromJson(rawResult);
+    if (result == null) {
+      throw new Exception("User properties deserialization failed");
     }
+    return result;
   }
 
   @override
   Future<void> collectAdvertisingId() async {
     if (Platform.isIOS) {
-      try {
-        return await _channel.invokeMethod(Constants.mCollectAdvertisingId);
-      } on PlatformException catch (e) {
-        throw _convertPlatformException(e);
-      }
+      return await _invokeMethod(Constants.mCollectAdvertisingId);
     }
   }
 
   @override
   Future<void> collectAppleSearchAdsAttribution() async {
     if (Platform.isIOS) {
-      try {
-        return await _channel.invokeMethod(Constants.mCollectAppleSearchAdsAttribution);
-      } on PlatformException catch (e) {
-        throw _convertPlatformException(e);
-      }
+      return await _invokeMethod(Constants.mCollectAppleSearchAdsAttribution);
     }
   }
 
   @override
   Future<void> presentCodeRedemptionSheet() async {
     if (Platform.isIOS) {
-      try {
-        return await _channel.invokeMethod(Constants.mPresentCodeRedemptionSheet);
-      } on PlatformException catch (e) {
-        throw _convertPlatformException(e);
-      }
+      return await _invokeMethod(Constants.mPresentCodeRedemptionSheet);
     }
   }
 
@@ -504,14 +379,10 @@ class QonversionInternal implements Qonversion {
       return null;
     }
 
-    try {
-      final rawResult = await _channel.invokeMethod(
-          Constants.mPromoPurchase, {Constants.kProductId: productId});
-      final result = QMapper.entitlementsFromJson(rawResult);
-      return result;
-    } on PlatformException catch (e) {
-      throw _convertPurchaseException(e);
-    }
+    final rawResult = await _invokePurchaseMethod(
+        Constants.mPromoPurchase, {Constants.kProductId: productId});
+    final result = QMapper.entitlementsFromJson(rawResult);
+    return result;
   }
 
   // Private methods
@@ -526,6 +397,25 @@ class QonversionInternal implements Qonversion {
     }
   }
 
+  /// Invokes a method on the platform channel and converts PlatformException to QonversionException
+  Future<dynamic> _invokeMethod(String method, [Map<String, dynamic>? arguments]) async {
+    try {
+      return await _channel.invokeMethod(method, arguments);
+    } on PlatformException catch (e) {
+      throw _convertPlatformException(e);
+    }
+  }
+
+  /// Invokes a method on the platform channel and converts PlatformException to QPurchaseException
+  /// Use this for purchase-related methods
+  Future<dynamic> _invokePurchaseMethod(String method, [Map<String, dynamic>? arguments]) async {
+    try {
+      return await _channel.invokeMethod(method, arguments);
+    } on PlatformException catch (e) {
+      throw _convertPurchaseException(e);
+    }
+  }
+
   static QPurchaseException _convertPurchaseException(PlatformException error) {
     return QPurchaseException(
         error.code,

From 21784f1cb77a7bc35d9dd9708cb4c3fd1edea520 Mon Sep 17 00:00:00 2001
From: Surik <action@github.com>
Date: Fri, 21 Nov 2025 17:04:37 +0300
Subject: [PATCH 4/5] Fixed warnings

---
 lib/src/dto/qonversion_exception.dart     |  2 --
 lib/src/internal/nocodes_internal.dart    |  7 ++++++-
 lib/src/internal/qonversion_internal.dart | 10 +++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/src/dto/qonversion_exception.dart b/lib/src/dto/qonversion_exception.dart
index 4eae8ec2..367a80f9 100644
--- a/lib/src/dto/qonversion_exception.dart
+++ b/lib/src/dto/qonversion_exception.dart
@@ -1,5 +1,3 @@
-import 'qonversion_error_code.dart';
-
 /// General Qonversion exception for all non-purchase related errors
 class QonversionException implements Exception {
   /// Qonversion Error Code
diff --git a/lib/src/internal/nocodes_internal.dart b/lib/src/internal/nocodes_internal.dart
index 76839945..50d6d4ad 100644
--- a/lib/src/internal/nocodes_internal.dart
+++ b/lib/src/internal/nocodes_internal.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:developer' as developer;
 import 'dart:io';
 import 'package:flutter/services.dart';
 import 'package:qonversion_flutter/src/dto/qonversion_exception.dart';
@@ -39,7 +40,11 @@ class NoCodesInternal implements NoCodes {
     };
     // Initialize is fire-and-forget, errors will be handled in subsequent calls
     _channel.invokeMethod(Constants.mInitializeNoCodes, args).catchError((error) {
-      // Silently ignore initialization errors
+      developer.log(
+        'Failed to initialize NoCodes: $error',
+        name: 'QonversionFlutter',
+        error: error,
+      );
     });
   }
 
diff --git a/lib/src/internal/qonversion_internal.dart b/lib/src/internal/qonversion_internal.dart
index ae74ce5d..67fc22a9 100644
--- a/lib/src/internal/qonversion_internal.dart
+++ b/lib/src/internal/qonversion_internal.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:developer' as developer;
 import 'dart:io';
 
 import 'package:flutter/services.dart';
 import 'package:qonversion_flutter/qonversion_flutter.dart';
-import 'package:qonversion_flutter/src/dto/qonversion_exception.dart';
 import 'package:qonversion_flutter/src/internal/mapper.dart';
 import 'package:qonversion_flutter/src/internal/utils/string.dart';
 
@@ -35,7 +35,11 @@ class QonversionInternal implements Qonversion {
     };
     // Initialize is fire-and-forget, errors will be handled in subsequent calls
     _channel.invokeMethod(Constants.mInitialize, args).catchError((error) {
-      // Silently ignore initialization errors
+      developer.log(
+        'Failed to initialize Qonversion: $error',
+        name: 'QonversionFlutter',
+        error: error,
+      );
     });
   }
 
@@ -392,7 +396,7 @@ class QonversionInternal implements Qonversion {
         Constants.kVersion: sdkVersion,
         Constants.kSource: Constants.sdkSource,
       });
-    } on PlatformException catch (e) {
+    } on PlatformException {
       // Silently ignore errors in SDK info storage
     }
   }

From 505c587061a6879fe52580ddd0b4ef4325836670 Mon Sep 17 00:00:00 2001
From: Surik <action@github.com>
Date: Fri, 21 Nov 2025 17:17:54 +0300
Subject: [PATCH 5/5] Updated exceptions logic

---
 lib/src/internal/qonversion_internal.dart | 36 +++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/lib/src/internal/qonversion_internal.dart b/lib/src/internal/qonversion_internal.dart
index 67fc22a9..7b841c94 100644
--- a/lib/src/internal/qonversion_internal.dart
+++ b/lib/src/internal/qonversion_internal.dart
@@ -208,7 +208,11 @@ class QonversionInternal implements Qonversion {
 
     final result = QMapper.userFromJson(rawResult);
     if (result == null) {
-      throw new Exception("User deserialization failed");
+      throw QonversionException(
+        QErrorCode.internalError.code,
+        "User deserialization failed",
+        null,
+      );
     }
     return result;
   }
@@ -224,7 +228,11 @@ class QonversionInternal implements Qonversion {
 
     final result = QMapper.userFromJson(rawResult);
     if (result == null) {
-      throw new Exception("User deserialization failed");
+      throw QonversionException(
+        QErrorCode.internalError.code,
+        "User deserialization failed",
+        null,
+      );
     }
     return result;
   }
@@ -238,7 +246,11 @@ class QonversionInternal implements Qonversion {
 
     final result = QMapper.remoteConfigFromJson(rawResult);
     if (result == null) {
-      throw new Exception("Remote config deserialization failed");
+      throw QonversionException(
+        QErrorCode.internalError.code,
+        "Remote config deserialization failed",
+        null,
+      );
     }
     return result;
   }
@@ -249,7 +261,11 @@ class QonversionInternal implements Qonversion {
 
     final result = QMapper.remoteConfigListFromJson(rawResult);
     if (result == null) {
-      throw new Exception("Remote config list deserialization failed");
+      throw QonversionException(
+        QErrorCode.internalError.code,
+        "Remote config list deserialization failed",
+        null,
+      );
     }
     return result;
   }
@@ -267,7 +283,11 @@ class QonversionInternal implements Qonversion {
 
     final result = QMapper.remoteConfigListFromJson(rawResult);
     if (result == null) {
-      throw new Exception("Remote config list deserialization failed");
+      throw QonversionException(
+        QErrorCode.internalError.code,
+        "Remote config list deserialization failed",
+        null,
+      );
     }
     return result;
   }
@@ -351,7 +371,11 @@ class QonversionInternal implements Qonversion {
 
     final result = QMapper.userPropertiesFromJson(rawResult);
     if (result == null) {
-      throw new Exception("User properties deserialization failed");
+      throw QonversionException(
+        QErrorCode.internalError.code,
+        "User properties deserialization failed",
+        null,
+      );
     }
     return result;
   }