From ac6e955bc43287fdb2e015b3029552e638ce1ecd Mon Sep 17 00:00:00 2001
From: Dani-Koza-AF <dani.ko@appsflyer.com>
Date: Wed, 19 Feb 2025 17:17:39 +0200
Subject: [PATCH 1/7] removed duplicated declaration

---
 lib/src/appsflyer_constants.dart | 50 --------------------------------
 1 file changed, 50 deletions(-)

diff --git a/lib/src/appsflyer_constants.dart b/lib/src/appsflyer_constants.dart
index fe67ec2..2f7b141 100644
--- a/lib/src/appsflyer_constants.dart
+++ b/lib/src/appsflyer_constants.dart
@@ -28,53 +28,3 @@ class AppsflyerConstants {
   static const String DISABLE_ADVERTISING_IDENTIFIER =
       "disableAdvertisingIdentifier";
 }
-
-enum AFMediationNetwork {
-  ironSource,
-  applovinMax,
-  googleAdMob,
-  fyber,
-  appodeal,
-  admost,
-  topon,
-  tradplus,
-  yandex,
-  chartboost,
-  unity,
-  toponPte,
-  customMediation,
-  directMonetizationNetwork;
-
-  String get value {
-    switch (this) {
-      case AFMediationNetwork.ironSource:
-        return "ironsource";
-      case AFMediationNetwork.applovinMax:
-        return "applovin_max";
-      case AFMediationNetwork.googleAdMob:
-        return "google_admob";
-      case AFMediationNetwork.fyber:
-        return "fyber";
-      case AFMediationNetwork.appodeal:
-        return "appodeal";
-      case AFMediationNetwork.admost:
-        return "admost";
-      case AFMediationNetwork.topon:
-        return "topon";
-      case AFMediationNetwork.tradplus:
-        return "tradplus";
-      case AFMediationNetwork.yandex:
-        return "yandex";
-      case AFMediationNetwork.chartboost:
-        return "chartboost";
-      case AFMediationNetwork.unity:
-        return "unity";
-      case AFMediationNetwork.toponPte:
-        return "topon_pte";
-      case AFMediationNetwork.customMediation:
-        return "custom_mediation";
-      case AFMediationNetwork.directMonetizationNetwork:
-        return "direct_monetization_network";
-    }
-  }
-}

From b66440d29cf19918f9dda069b99c02a28980c610 Mon Sep 17 00:00:00 2001
From: Dani-Koza-AF <dani.ko@appsflyer.com>
Date: Wed, 23 Jul 2025 15:04:26 +0300
Subject: [PATCH 2/7] Update .gitignore for purchase connector feature

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 591007a..db41b25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,10 +107,11 @@ example/web/*
 
 example/android/app/.cxx
 
+example/android/app/.cxx/*
+
 example/\.metadata
 example/analysis_options.yaml
 
-
 node_modules/
 
 covBadgeGen.js

From a6ab58c0a4a6e6bd0042daa41b0485ebd5002890 Mon Sep 17 00:00:00 2001
From: Dani-Koza-AF <dani.ko@appsflyer.com>
Date: Thu, 24 Jul 2025 15:42:50 +0300
Subject: [PATCH 3/7] Add complete Purchase Connector implementation

- Add Purchase Connector support for Android and iOS platforms
- Implement conditional compilation with include/exclude source sets
- Add comprehensive Dart API with type-safe models
- Include platform-specific error handling and validation
- Add Purchase Connector documentation
- Support for both in-app purchases and subscriptions
- Zero impact when disabled via gradle/podfile flags

New files:
- Complete lib/src/purchase_connector/ Dart implementation
- Android: include/exclude-connector source sets with ConnectorWrapper
- iOS: PurchaseConnectorPlugin.swift with conditional compilation
- Documentation: PurchaseConnector.md

Modified integration points:
- Android: build.gradle, AppsflyerSdkPlugin.java
- iOS: appsflyer_sdk.podspec with subspecs architecture
- Flutter: appsflyer_sdk.dart main export file
---
 android/build.gradle                          |  23 +-
 .../AppsFlyerPurchaseConnector.kt             |   8 +
 .../AppsFlyerPurchaseConnector.kt             | 207 +++++++++++
 .../appsflyersdk/ConnectorWrapper.kt          | 251 +++++++++++++
 .../appsflyersdk/AppsflyerSdkPlugin.java      |  56 +--
 doc/PurchaseConnector.md                      | 323 +++++++++++++++++
 .../PurchaseConnectorPlugin.swift             | 170 +++++++++
 ios/appsflyer_sdk.podspec                     |  36 +-
 lib/appsflyer_sdk.dart                        |  20 +-
 .../connector_callbacks.dart                  |  18 +
 .../missing_configuration_exception.dart      |  11 +
 .../in_app_purchase_validation_result.dart    |  33 ++
 .../purchase_connector/models/ios_error.dart  |  15 +
 .../models/jvm_throwable.dart                 |  16 +
 .../models/product_purchase.dart              |  44 +++
 .../models/subscription_purchase.dart         | 343 ++++++++++++++++++
 .../subscription_validation_result.dart       |  32 ++
 .../models/validation_failure_data.dart       |  20 +
 .../purchase_connector.dart                   | 254 +++++++++++++
 .../purchase_connector_configuration.dart     |  16 +
 20 files changed, 1825 insertions(+), 71 deletions(-)
 create mode 100644 android/src/main/exlude-connector/com/appsflyer/appsflyersdk/AppsFlyerPurchaseConnector.kt
 create mode 100644 android/src/main/include-connector/com/appsflyer/appsflyersdk/AppsFlyerPurchaseConnector.kt
 create mode 100644 android/src/main/include-connector/com/appsflyer/appsflyersdk/ConnectorWrapper.kt
 create mode 100644 doc/PurchaseConnector.md
 create mode 100644 ios/PurchaseConnector/PurchaseConnectorPlugin.swift
 create mode 100644 lib/src/purchase_connector/connector_callbacks.dart
 create mode 100644 lib/src/purchase_connector/missing_configuration_exception.dart
 create mode 100644 lib/src/purchase_connector/models/in_app_purchase_validation_result.dart
 create mode 100644 lib/src/purchase_connector/models/ios_error.dart
 create mode 100644 lib/src/purchase_connector/models/jvm_throwable.dart
 create mode 100644 lib/src/purchase_connector/models/product_purchase.dart
 create mode 100644 lib/src/purchase_connector/models/subscription_purchase.dart
 create mode 100644 lib/src/purchase_connector/models/subscription_validation_result.dart
 create mode 100644 lib/src/purchase_connector/models/validation_failure_data.dart
 create mode 100644 lib/src/purchase_connector/purchase_connector.dart
 create mode 100644 lib/src/purchase_connector/purchase_connector_configuration.dart

diff --git a/android/build.gradle b/android/build.gradle
index fc69f9f..84a1590 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -16,10 +16,12 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
 
+def includeConnector = project.findProperty('appsflyer.enable_purchase_connector')?.toBoolean() ?: false
+
 android {
     defaultConfig {
         minSdkVersion 19
-        compileSdk 35
+        compileSdk 33
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true
@@ -29,20 +31,25 @@ android {
     }
     namespace 'com.appsflyer.appsflyersdk'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+    sourceSets {
+        main {
+            java.srcDirs = ['src/main/java']
+            java.srcDirs += includeConnector ? ['src/main/include-connector'] : ['src/main/exlude-connector']
+        }
+        includeConnector ? ['src/main/include-connector'] : ['src/main/exlude-connector']
     }
-
     kotlinOptions {
         jvmTarget = '17'
     }
-
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'com.appsflyer:af-android-sdk:6.16.2'
-    implementation 'com.android.installreferrer:installreferrer:2.1'
+    implementation 'com.appsflyer:af-android-sdk:6.15.2'
+    implementation 'com.android.installreferrer:installreferrer:2.2'
+//    implementation 'androidx.core:core-ktx:1.13.1'
+    if (includeConnector) {
+        implementation 'com.appsflyer:purchase-connector:2.1.0'
+    }
 }
\ No newline at end of file
diff --git a/android/src/main/exlude-connector/com/appsflyer/appsflyersdk/AppsFlyerPurchaseConnector.kt b/android/src/main/exlude-connector/com/appsflyer/appsflyersdk/AppsFlyerPurchaseConnector.kt
new file mode 100644
index 0000000..188033f
--- /dev/null
+++ b/android/src/main/exlude-connector/com/appsflyer/appsflyersdk/AppsFlyerPurchaseConnector.kt
@@ -0,0 +1,8 @@
+package com.appsflyer.appsflyersdk
+
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+
+object AppsFlyerPurchaseConnector: FlutterPlugin {
+    override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) = Unit
+    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) = Unit
+}
\ No newline at end of file
diff --git a/android/src/main/include-connector/com/appsflyer/appsflyersdk/AppsFlyerPurchaseConnector.kt b/android/src/main/include-connector/com/appsflyer/appsflyersdk/AppsFlyerPurchaseConnector.kt
new file mode 100644
index 0000000..a923fe9
--- /dev/null
+++ b/android/src/main/include-connector/com/appsflyer/appsflyersdk/AppsFlyerPurchaseConnector.kt
@@ -0,0 +1,207 @@
+package com.appsflyer.appsflyersdk
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import org.json.JSONObject
+import java.lang.ref.WeakReference
+
+
+/**
+ * A Flutter plugin that establishes a bridge between the Flutter appsflyer SDK and the Native Android Purchase Connector.
+ *
+ * This plugin utilizes MethodChannels to communicate between Flutter and native Android,
+ * passing method calls and event callbacks.
+ *
+ * @property methodChannel used to set up the communication channel between Flutter and Android.
+ * @property contextRef a Weak Reference to the application context when the plugin is first attached. Used to build the Appsflyer's Purchase Connector.
+ * @property connectorWrapper wraps the Appsflyer's Android purchase client and bridge map conversion methods. Used to perform various operations (configure, start/stop observing transactions).
+ * @property arsListener an object of [MappedValidationResultListener] that handles SubscriptionPurchaseValidationResultListener responses and failures. Lazily initialized.
+ * @property viapListener an object of [MappedValidationResultListener] that handles InAppValidationResultListener responses and failures. Lazily initialized.
+ */
+object AppsFlyerPurchaseConnector : FlutterPlugin, MethodChannel.MethodCallHandler {
+    private var methodChannel: MethodChannel? = null
+    private var contextRef: WeakReference<Context>? = null
+    private var connectorWrapper: ConnectorWrapper? = null
+    private val handler by lazy { Handler(Looper.getMainLooper()) }
+
+    private val arsListener: MappedValidationResultListener by lazy {
+        object : MappedValidationResultListener {
+            override fun onFailure(result: String, error: Throwable?) {
+                val resMap = mapOf("result" to result, "error" to error?.toMap())
+                methodChannel?.invokeMethodOnUI(
+                    "SubscriptionPurchaseValidationResultListener:onFailure",
+                    resMap
+                )
+            }
+
+            override fun onResponse(p0: Map<String, Any>?) {
+                methodChannel?.invokeMethodOnUI(
+                    "SubscriptionPurchaseValidationResultListener:onResponse",
+                    p0
+                )
+            }
+        }
+    }
+
+    private val viapListener: MappedValidationResultListener by lazy {
+        object : MappedValidationResultListener {
+            override fun onFailure(result: String, error: Throwable?) {
+                val resMap = mapOf("result" to result, "error" to error?.toMap())
+                methodChannel?.invokeMethodOnUI("InAppValidationResultListener:onFailure", resMap)
+            }
+
+            override fun onResponse(p0: Map<String, Any>?) {
+                methodChannel?.invokeMethodOnUI("InAppValidationResultListener:onResponse", p0)
+            }
+        }
+    }
+
+    private fun MethodChannel?.invokeMethodOnUI(method: String, args: Any?) = this?.let {
+        handler.post {
+            val data = if (args is Map<*, *>) {
+                JSONObject(args).toString()
+            } else {
+                args
+            }
+            it.invokeMethod(method, data)
+        }
+    }
+
+
+    /**
+     * Called when the plugin is attached to the Flutter engine.
+     *
+     * It sets up the MethodChannel and retains the application context.
+     *
+     * @param binding The binding provides access to the binary messenger and application context.
+     */
+    override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        methodChannel =
+            MethodChannel(
+                binding.binaryMessenger,
+                AppsFlyerConstants.AF_PURCHASE_CONNECTOR_CHANNEL
+            ).also {
+                it.setMethodCallHandler(this)
+            }
+        contextRef = WeakReference(binding.applicationContext)
+    }
+
+    /**
+     * Called when the plugin is detached from the Flutter engine.
+     *
+     * @param binding The binding that was provided in [onAttachedToEngine].
+     */
+    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) = Unit
+
+    /**
+     * Handles incoming method calls from Flutter.
+     *
+     * It either triggers a connector operation or returns an unimplemented error.
+     * Supported operations are configuring, starting and stopping observing transactions.
+     *
+     * @param call The method call from Flutter.
+     * @param result The result to be returned to Flutter.
+     */
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+        when (call.method) {
+            "startObservingTransactions" -> startObservingTransactions(result)
+            "stopObservingTransactions" -> stopObservingTransactions(result)
+            "configure" -> configure(call, result)
+            else -> result.notImplemented()
+        }
+    }
+
+    /**
+     * Configures the purchase connector with the parameters sent from Flutter.
+     *
+     * @param call The method call from Flutter.
+     * @param result The result to be returned to Flutter.
+     */
+    private fun configure(call: MethodCall, result: MethodChannel.Result) {
+        if (connectorWrapper == null) {
+            contextRef?.get()?.let { ctx ->
+                connectorWrapper = ConnectorWrapper(
+                    ctx, call.getBoolean("logSubscriptions"),
+                    call.getBoolean("logInApps"),
+                    call.getBoolean("sandbox"),
+                    arsListener, viapListener
+                )
+                result.success(null)
+            } ?: run {
+                result.error("402", "Missing context. Is plugin attached to engine?", null)
+            }
+
+        } else {
+            result.error("401", "Connector already configured", null)
+        }
+    }
+
+    /**
+     * Starts observing transactions.
+     *
+     * @param result The result to be returned to Flutter.
+     */
+    private fun startObservingTransactions(result: MethodChannel.Result) =
+        connectorOperation(result) {
+            it.startObservingTransactions()
+        }
+
+    /**
+     * Stops observing transactions.
+     *
+     * @param result The result to be returned to Flutter.
+     */
+    private fun stopObservingTransactions(result: MethodChannel.Result) =
+        connectorOperation(result) {
+            it.stopObservingTransactions()
+        }
+
+    /**
+     * Performs a specified operation on the connector after confirming that the connector has been configured.
+     *
+     * @param result The result to be returned to Flutter.
+     * @param exc The operation to be performed on the connector.
+     */
+    private fun connectorOperation(
+        result: MethodChannel.Result,
+        exc: (connectorWrapper: ConnectorWrapper) -> Unit
+    ) {
+        if (connectorWrapper != null) {
+            exc(connectorWrapper!!)
+            result.success(null)
+        } else {
+            result.error("404", "Connector not configured, did you called `configure` first?", null)
+        }
+    }
+
+    /**
+     * Converts a [Throwable] to a Map that can be returned to Flutter.
+     *
+     * @return A map representing the [Throwable].
+     */
+    private fun Throwable.toMap(): Map<String, Any?> {
+        return mapOf(
+            "type" to this::class.simpleName,
+            "message" to this.message,
+            "stacktrace" to this.stackTrace.joinToString(separator = "\n") { it.toString() },
+            "cause" to this.cause?.toMap()
+        )
+    }
+
+    /**
+     * Attempts to get a Boolean argument from the method call.
+     *
+     * If unsuccessful, it returns the default value.
+     *
+     * @param key The key for the argument.
+     * @param defValue The default value to be returned if the argument does not exist.
+     * @return The value of the argument or the default value if the argument does not exist.
+     */
+    private fun MethodCall.getBoolean(key: String, defValue: Boolean = false): Boolean =
+        runCatching { argument<Boolean>(key)!! }.getOrDefault(defValue)
+
+}
\ No newline at end of file
diff --git a/android/src/main/include-connector/com/appsflyer/appsflyersdk/ConnectorWrapper.kt b/android/src/main/include-connector/com/appsflyer/appsflyersdk/ConnectorWrapper.kt
new file mode 100644
index 0000000..cc9e2bf
--- /dev/null
+++ b/android/src/main/include-connector/com/appsflyer/appsflyersdk/ConnectorWrapper.kt
@@ -0,0 +1,251 @@
+package com.appsflyer.appsflyersdk
+
+import android.content.Context
+import com.appsflyer.api.PurchaseClient
+import com.appsflyer.api.Store
+import com.appsflyer.internal.models.*
+import com.appsflyer.internal.models.InAppPurchaseValidationResult
+import com.appsflyer.internal.models.SubscriptionPurchase
+import com.appsflyer.internal.models.SubscriptionValidationResult
+import com.appsflyer.internal.models.ValidationFailureData
+
+interface MappedValidationResultListener : PurchaseClient.ValidationResultListener<Map<String, Any>>
+
+/**
+ * A connector class that wraps the Android purchase connector client.
+ *
+ * This class uses the Builder pattern to configure the Android purchase connector client.
+ * It implements the [PurchaseClient] interface required by the appsflyer_sdk and translates
+ * the various callbacks and responses between the two interfaces.
+ *
+ * @property context The application context.
+ * @property logSubs If true, subscription transactions will be logged.
+ * @property logInApps If true, in-app purchase transactions will be logged.
+ * @property sandbox If true, the purchase client will be in sandbox mode.
+ * @property subsListener The listener for subscription purchase validation results.
+ * @property inAppListener The listener for in-app purchase validation Result.
+ */
+class ConnectorWrapper(
+    context: Context,
+    logSubs: Boolean,
+    logInApps: Boolean,
+    sandbox: Boolean,
+    subsListener: MappedValidationResultListener,
+    inAppListener: MappedValidationResultListener,
+) :
+    PurchaseClient {
+    private val connector =
+        PurchaseClient.Builder(context, Store.GOOGLE).setSandbox(sandbox).logSubscriptions(logSubs)
+            .autoLogInApps(logInApps).setSubscriptionValidationResultListener(object :
+                PurchaseClient.SubscriptionPurchaseValidationResultListener {
+                override fun onResponse(result: Map<String, SubscriptionValidationResult>?) {
+                    subsListener.onResponse(result?.entries?.associate { (k, v) -> k to v.toJsonMap() })
+                }
+
+                override fun onFailure(result: String, error: Throwable?) {
+                    subsListener.onFailure(result, error)
+                }
+            }).setInAppValidationResultListener(object : PurchaseClient.InAppPurchaseValidationResultListener{
+                override fun onResponse(result: Map<String, InAppPurchaseValidationResult>?) {
+                    inAppListener.onResponse(result?.entries?.associate { (k, v) -> k to v.toJsonMap() })
+                }
+
+                override fun onFailure(result: String, error: Throwable?) {
+                    inAppListener.onFailure(result, error)
+                }
+            })
+            .build()
+
+    /**
+     * Starts observing all incoming transactions from the play store.
+     */
+    override fun startObservingTransactions() = connector.startObservingTransactions()
+
+    /**
+     * Stops observing all incoming transactions from the play store.
+     */
+    override fun stopObservingTransactions() = connector.stopObservingTransactions()
+
+
+    /**
+     * Converts [SubscriptionPurchase] to a Json map, which then is delivered to SDK's method response.
+     *
+     * @return A map representing this SubscriptionPurchase.
+     */
+    private fun SubscriptionPurchase.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "acknowledgementState" to acknowledgementState,
+            "canceledStateContext" to canceledStateContext?.toJsonMap(),
+            "externalAccountIdentifiers" to externalAccountIdentifiers?.toJsonMap(),
+            "kind" to kind,
+            "latestOrderId" to latestOrderId,
+            "lineItems" to lineItems.map { it.toJsonMap() },
+            "linkedPurchaseToken" to linkedPurchaseToken,
+            "pausedStateContext" to pausedStateContext?.toJsonMap(),
+            "regionCode" to regionCode,
+            "startTime" to startTime,
+            "subscribeWithGoogleInfo" to subscribeWithGoogleInfo?.toJsonMap(),
+            "subscriptionState" to subscriptionState,
+            "testPurchase" to testPurchase?.toJsonMap()
+        )
+    }
+
+    private fun CanceledStateContext.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "developerInitiatedCancellation" to developerInitiatedCancellation?.toJsonMap(),
+            "replacementCancellation" to replacementCancellation?.toJsonMap(),
+            "systemInitiatedCancellation" to systemInitiatedCancellation?.toJsonMap(),
+            "userInitiatedCancellation" to userInitiatedCancellation?.toJsonMap()
+        )
+    }
+
+    private fun DeveloperInitiatedCancellation.toJsonMap(): Map<String, Any?> {
+        return mapOf()
+    }
+
+    private fun ReplacementCancellation.toJsonMap(): Map<String, Any?> {
+        return mapOf()
+    }
+
+    private fun SystemInitiatedCancellation.toJsonMap(): Map<String, Any?> {
+        return mapOf()
+    }
+
+    private fun UserInitiatedCancellation.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "cancelSurveyResult" to cancelSurveyResult?.toJsonMap(),
+            "cancelTime" to cancelTime
+        )
+    }
+
+    private fun CancelSurveyResult.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "reason" to reason,
+            "reasonUserInput" to reasonUserInput
+        )
+    }
+
+    private fun ExternalAccountIdentifiers.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "externalAccountId" to externalAccountId,
+            "obfuscatedExternalAccountId" to obfuscatedExternalAccountId,
+            "obfuscatedExternalProfileId" to obfuscatedExternalProfileId
+        )
+    }
+
+    private fun SubscriptionPurchaseLineItem.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "autoRenewingPlan" to autoRenewingPlan?.toJsonMap(),
+            "deferredItemReplacement" to deferredItemReplacement?.toJsonMap(),
+            "expiryTime" to expiryTime,
+            "offerDetails" to offerDetails?.toJsonMap(),
+            "prepaidPlan" to prepaidPlan?.toJsonMap(),
+            "productId" to productId
+        )
+    }
+
+    private fun OfferDetails.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "offerTags" to offerTags,
+            "basePlanId" to basePlanId,
+            "offerId" to offerId
+        )
+    }
+
+    private fun AutoRenewingPlan.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "autoRenewEnabled" to autoRenewEnabled,
+            "priceChangeDetails" to priceChangeDetails?.toJsonMap()
+        )
+    }
+
+    private fun SubscriptionItemPriceChangeDetails.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "expectedNewPriceChargeTime" to expectedNewPriceChargeTime,
+            "newPrice" to newPrice?.toJsonMap(),
+            "priceChangeMode" to priceChangeMode,
+            "priceChangeState" to priceChangeState
+        )
+    }
+
+    private fun Money.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "currencyCode" to currencyCode,
+            "nanos" to nanos,
+            "units" to units
+        )
+    }
+
+    private fun DeferredItemReplacement.toJsonMap(): Map<String, Any?> {
+        return mapOf("productId" to productId)
+    }
+
+    private fun PrepaidPlan.toJsonMap(): Map<String, Any?> {
+        return mapOf("allowExtendAfterTime" to allowExtendAfterTime)
+    }
+
+    private fun PausedStateContext.toJsonMap(): Map<String, Any?> {
+        return mapOf("autoResumeTime" to autoResumeTime)
+    }
+
+    private fun SubscribeWithGoogleInfo.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "emailAddress" to emailAddress,
+            "familyName" to familyName,
+            "givenName" to givenName,
+            "profileId" to profileId,
+            "profileName" to profileName
+        )
+    }
+
+    fun TestPurchase.toJsonMap(): Map<String, Any?> {
+        return mapOf()
+    }
+
+    private fun ProductPurchase.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "kind" to kind,
+            "purchaseTimeMillis" to purchaseTimeMillis,
+            "purchaseState" to purchaseState,
+            "consumptionState" to consumptionState,
+            "developerPayload" to developerPayload,
+            "orderId" to orderId,
+            "purchaseType" to purchaseType,
+            "acknowledgementState" to acknowledgementState,
+            "purchaseToken" to purchaseToken,
+            "productId" to productId,
+            "quantity" to quantity,
+            "obfuscatedExternalAccountId" to obfuscatedExternalAccountId,
+            "obfuscatedExternalProfileId" to obfuscatedExternalProfileId,
+            "regionCode" to regionCode
+        )
+    }
+
+    /**
+     * Converts [InAppPurchaseValidationResult] into a map of objects so that the Object can be passed to Flutter using a method channel
+     *
+     * @return A map representing this InAppPurchaseValidationResult.
+     */
+    private fun InAppPurchaseValidationResult.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "success" to success,
+            "productPurchase" to productPurchase?.toJsonMap(),
+            "failureData" to failureData?.toJsonMap()
+        )
+    }
+
+    private fun SubscriptionValidationResult.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "success" to success,
+            "subscriptionPurchase" to subscriptionPurchase?.toJsonMap(),
+            "failureData" to failureData?.toJsonMap()
+        )
+    }
+
+    private fun ValidationFailureData.toJsonMap(): Map<String, Any?> {
+        return mapOf(
+            "status" to status,
+            "description" to description
+        )
+    }
+}
\ No newline at end of file
diff --git a/android/src/main/java/com/appsflyer/appsflyersdk/AppsflyerSdkPlugin.java b/android/src/main/java/com/appsflyer/appsflyersdk/AppsflyerSdkPlugin.java
index 23eb797..ed34267 100644
--- a/android/src/main/java/com/appsflyer/appsflyersdk/AppsflyerSdkPlugin.java
+++ b/android/src/main/java/com/appsflyer/appsflyersdk/AppsflyerSdkPlugin.java
@@ -34,7 +34,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
@@ -53,8 +52,6 @@
 import static com.appsflyer.appsflyersdk.AppsFlyerConstants.AF_PLUGIN_TAG;
 import static com.appsflyer.appsflyersdk.AppsFlyerConstants.AF_SUCCESS;
 
-import androidx.annotation.NonNull;
-
 /**
  * AppsflyerSdkPlugin
  */
@@ -75,6 +72,7 @@ public class AppsflyerSdkPlugin implements MethodCallHandler, FlutterPlugin, Act
     //private FlutterView mFlutterView;
     private Context mContext;
     private Application mApplication;
+    private Intent mIntent;
     private MethodChannel mMethodChannel;
     private MethodChannel mCallbackChannel;
     private Activity activity;
@@ -177,6 +175,7 @@ private void onAttachedToEngine(Context applicationContext, BinaryMessenger mess
         mMethodChannel.setMethodCallHandler(this);
         mCallbackChannel = new MethodChannel(messenger, AppsFlyerConstants.AF_CALLBACK_CHANNEL);
         mCallbackChannel.setMethodCallHandler(callbacksHandler);
+
     }
 
 
@@ -206,7 +205,6 @@ private void startListening(Object arguments, Result rawResult) {
     public void onMethodCall(MethodCall call, Result result) {
         if (activity == null) {
             Log.d(AF_PLUGIN_TAG, LogMessages.ACTIVITY_NOT_ATTACHED_TO_ENGINE);
-            result.error("NO_ACTIVITY", "The current activity is null", null);
             return;
         }
         final String method = call.method;
@@ -235,9 +233,6 @@ public void onMethodCall(MethodCall call, Result result) {
             case "setConsentData":
                 setConsentData(call, result);
                 break;
-            case "setConsentDataV2":
-                setConsentDataV2(call, result);
-                break;    
             case "setIsUpdate":
                 setIsUpdate(call, result);
                 break;
@@ -429,11 +424,6 @@ private void startSDK(MethodCall call, final Result result) {
         result.success(null);
     }
 
-    /**
-     * Sets the user consent data for tracking.
-     * @deprecated Use {@link #setConsentDataV2(MethodCall, Result)} instead.
-     */
-    @Deprecated
     public void setConsentData(MethodCall call, Result result) {
         Map<String, Object> arguments = (Map<String, Object>) call.arguments;
         Map<String, Object> consentDict = (Map<String, Object>) arguments.get("consentData");
@@ -455,35 +445,6 @@ public void setConsentData(MethodCall call, Result result) {
         result.success(null);
     }
 
-    /**
-     * Sets the user consent data for tracking with flexible parameters.
-     */
-    public void setConsentDataV2(MethodCall call, Result result) {
-        try {
-            AppsFlyerConsent consent = getAppsFlyerConsentFromCall(call);
-            AppsFlyerLib.getInstance().setConsentData(consent);
-            result.success(null);
-        } catch (Exception e) {
-            Log.e(AF_PLUGIN_TAG, LogMessages.ERROR_WHILE_SETTING_CONSENT + e.getMessage(), e);
-            result.error("CONSENT_ERROR", LogMessages.ERROR_WHILE_SETTING_CONSENT + e.getMessage(), null);
-        }
-    }
-
-    @NonNull
-    @SuppressWarnings("unchecked")
-    private AppsFlyerConsent getAppsFlyerConsentFromCall(MethodCall call) {
-        Map<String, Object> args = (Map<String, Object>) call.arguments;
-
-        // Extract nullable Boolean arguments
-        Boolean isUserSubjectToGDPR = (Boolean) args.get("isUserSubjectToGDPR");
-        Boolean consentForDataUsage = (Boolean) args.get("consentForDataUsage");
-        Boolean consentForAdsPersonalization = (Boolean) args.get("consentForAdsPersonalization");
-        Boolean hasConsentForAdStorage = (Boolean) args.get("hasConsentForAdStorage");
-
-        // Create and return AppsFlyerConsent object with the given parameters
-        return new AppsFlyerConsent(isUserSubjectToGDPR, consentForDataUsage, consentForAdsPersonalization, hasConsentForAdStorage);
-    }
-
     private void enableTCFDataCollection(MethodCall call, Result result) {
         boolean shouldCollect = (boolean) call.argument("shouldCollect");
         AppsFlyerLib.getInstance().enableTCFDataCollection(shouldCollect);
@@ -1009,7 +970,7 @@ private void logAdRevenue(MethodCall call, Result result) {
             double revenue = requireNonNullArgument(call, "revenue");
             String mediationNetworkString = requireNonNullArgument(call, "mediationNetwork");
 
-            MediationNetwork mediationNetwork = MediationNetwork.valueOf(mediationNetworkString.toUpperCase(Locale.ENGLISH));
+            MediationNetwork mediationNetwork = MediationNetwork.valueOf(mediationNetworkString.toUpperCase());
 
             // No null check for additionalParameters since it's acceptable for it to be null (optional data)
             Map<String, Object> additionalParameters = call.argument("additionalParameters");
@@ -1106,6 +1067,7 @@ private Map<String, Object> replaceNullValues(Map<String, Object> map) {
     @Override
     public void onAttachedToEngine(FlutterPluginBinding binding) {
         onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger());
+        AppsFlyerPurchaseConnector.INSTANCE.onAttachedToEngine(binding);
     }
 
     @Override
@@ -1114,33 +1076,33 @@ public void onDetachedFromEngine(FlutterPluginBinding binding) {
         mMethodChannel = null;
         mEventChannel.setStreamHandler(null);
         mEventChannel = null;
-        mContext = null;
-        mApplication = null;
+        AppsFlyerPurchaseConnector.INSTANCE.onDetachedFromEngine(binding);
+
     }
 
     @Override
     public void onAttachedToActivity(ActivityPluginBinding binding) {
         activity = binding.getActivity();
+        mIntent = binding.getActivity().getIntent();
         mApplication = binding.getActivity().getApplication();
         binding.addOnNewIntentListener(onNewIntentListener);
     }
 
     @Override
     public void onDetachedFromActivityForConfigChanges() {
-        this.activity = null;
+
     }
 
     @Override
     public void onReattachedToActivityForConfigChanges(ActivityPluginBinding binding) {
         sendCachedCallbacksToDart();
         binding.addOnNewIntentListener(onNewIntentListener);
-        activity = binding.getActivity();
     }
 
     @Override
     public void onDetachedFromActivity() {
         activity = null;
         saveCallbacks = true;
-        AppsFlyerLib.getInstance().unregisterConversionListener();
     }
+
 }
diff --git a/doc/PurchaseConnector.md b/doc/PurchaseConnector.md
new file mode 100644
index 0000000..b6cde59
--- /dev/null
+++ b/doc/PurchaseConnector.md
@@ -0,0 +1,323 @@
+
+# Flutter Purchase Connector
+**At a glance:** Automatically validate and measure revenue from in-app purchases and auto-renewable subscriptions to get the full picture of your customers' life cycles and accurate ROAS measurements.
+For more information please check the following pages:
+*  [ROI360 in-app purchase (IAP) and subscription revenue measurement](https://support.appsflyer.com/hc/en-us/articles/7459048170769-ROI360-in-app-purchase-IAP-and-subscription-revenue-measurement?query=purchase)
+* [Android Purchase Connector](https://dev.appsflyer.com/hc/docs/purchase-connector-android)
+* [iOS Purchase Connector](https://dev.appsflyer.com/hc/docs/purchase-connector-ios)
+
+🛠 In order for us to provide optimal support, we would kindly ask you to submit any issues to
+support@appsflyer.com
+
+> *When submitting an issue please specify your AppsFlyer sign-up (account) email , your app ID , production steps, logs, code snippets and any additional relevant information.*
+
+## Table Of Content
+<!-- TOC start (generated with https://github.com/derlin/bitdowntoc) -->
+
+* [Important Note](#important-note)
+* [Adding The Connector To Your Project](#install-connector)
+  - [How to Opt-In](#install-connector)
+  - [What Happens if You Use Dart Files Without Opting In?](#install-connector)
+* [Basic Integration Of The Connector](#basic-integration)
+  - [Create PurchaseConnector Instance](#create-instance)
+  - [Start Observing Transactions](#start)
+  - [Stop Observing Transactions](#stop)
+  - [Log Subscriptions](#log-subscriptions)
+  - [Log In App Purchases](#log-inapps)
+* [Register Validation Results Listeners](#validation-callbacks)
+  - [Cross-Platform Considerations](#cross-platform-considerations)
+  - [Android Callback Types](#android-callback-types)
+  - [Android - Subscription Validation Result Listener](#ars-validation-callbacks)
+  - [Android In Apps Validation Result Listener](#inapps-validation-callbacks)
+  - [iOS Combined  Validation Result Listener](#ios-callback)
+* [Testing the Integration](#testing)
+  - [Android](#testing-android)
+  - [iOS](#testing-ios)
+  - [Dart Usage for Android and iOS](#testing-config)
+* [ProGuard Rules for Android](#proguard)
+* [Full Code Example](#example)
+
+<!-- TOC end -->
+
+## <a id="important-note"> ⚠️ ⚠️ Important Note ⚠️ ⚠️
+
+The Purchase Connector feature of the AppsFlyer SDK depends on specific libraries provided by Google and Apple for managing in-app purchases:
+
+-   For Android, it depends on the  [Google Play Billing Library](https://developer.android.com/google/play/billing/integrate) (Supported versions: 5.x.x - 6.x.x).
+-   For iOS, it depends on  [StoreKit](https://developer.apple.com/documentation/storekit). (Supported version is StoreKit V1)
+
+However, these dependencies aren't actively included with the SDK. This means that the responsibility of managing these dependencies and including the necessary libraries in your project falls on you as the consumer of the SDK.
+
+If you're implementing in-app purchases in your app, you'll need to ensure that the Google Play Billing Library (for Android) or StoreKit (for iOS) are included in your project. You can include these libraries manually in your native code, or you can use a third-party Flutter plugin, such as the  [`in_app_purchase`](https://pub.dev/packages/in_app_purchase)  plugin.
+
+Remember to appropriately manage these dependencies when implementing the Purchase Validation feature in your app. Failing to include the necessary libraries might result in failures when attempting to conduct in-app purchases or validate purchases.
+
+## <a id="install-connector">  Adding The Connector To Your Project
+
+The Purchase Connector feature in AppsFlyer SDK Flutter Plugin is an optional enhancement that you can choose to use based on your requirements. This feature is not included by default and you'll have to opt-in if you wish to use it.
+
+### How to Opt-In
+
+To opt-in and include this feature in your app, you need to set specific properties based on your platform:
+
+For **iOS**, in your Podfile located within the `iOS` folder of your Flutter project, set `$AppsFlyerPurchaseConnector` to `true`.
+```ruby
+$AppsFlyerPurchaseConnector = true
+```
+For **Android**, in your `gradle.properties` file located within the `Android` folder of your Flutter project,, set `appsflyer.enable_purchase_connector` to `true`.
+```groovy
+appsflyer.enable_purchase_connector=true
+```
+Once you set these properties, the Purchase Validation feature will be integrated into your project and you can utilize its functionality in your app.
+
+### What Happens if You Use Dart Files Without Opting In?
+
+The Dart files for the Purchase Validation feature are always included in the plugin. If you try to use these Dart APIs without opting into the feature, the APIs will not have effect because the corresponding native code necessary for them to function will not be included in your project.
+
+In such cases, you'll likely experience errors or exceptions when trying to use functionalities provided by the Purchase Validation feature. To avoid these issues, ensure that you opt-in to the feature if you intend to use any related APIs.
+
+## <a id="basic-integration"> Basic Integration Of The Connector
+### <a id="create-instance"> Create PurchaseConnector Instance
+The `PurchaseConnector` requires a configuration object of type `PurchaseConnectorConfiguration` at instantiation time. This configuration object governs how the `PurchaseConnector` behaves in your application.
+
+To properly set up the configuration object, you must specify certain parameters:
+
+- `logSubscriptions`: If set to `true`, the connector logs all subscription events.
+- `logInApps`: If set to `true`, the connector logs all in-app purchase events.
+- `sandbox`: If set to `true`, transactions are tested in a sandbox environment. Be sure to set this to `false` in production.
+
+Here's an example usage:
+
+```dart
+void main() {
+  final afPurchaseClient = PurchaseConnector(
+    config: PurchaseConnectorConfiguration(
+      logSubscriptions: true,   // Enables logging of subscription events
+      logInApps: true,          // Enables logging of in-app purchase events
+      sandbox: true,            // Enables testing in a sandbox environment
+    ),
+  );
+
+  // Continue with your application logic...
+}
+```
+
+**IMPORTANT**: The `PurchaseConnectorConfiguration` is required only the first time you instantiate `PurchaseConnector`. If you attempt to create a `PurchaseConnector` instance and no instance has been initialized yet, you must provide a `PurchaseConnectorConfiguration`. If an instance already exists, the system will ignore the configuration provided and will return the existing instance to enforce the singleton pattern.
+
+For example:
+
+```dart
+void main() {
+  // Correct usage: Providing configuration at first instantiation
+  final purchaseConnector1 = PurchaseConnector(
+    config: PurchaseConnectorConfiguration(
+      logSubscriptions: true,
+      logInApps: true,
+      sandbox: true,
+    ),
+  );
+
+  // Additional instantiations will ignore the provided configuration
+  // and will return the previously created instance.
+  final purchaseConnector2 = PurchaseConnector(
+    config: PurchaseConnectorConfiguration(
+      logSubscriptions: false,
+      logInApps: false,
+      sandbox: false,
+    ),
+  );
+
+  // purchaseConnector1 and purchaseConnector2 point to the same instance
+  assert(purchaseConnector1 == purchaseConnector2);
+}
+```
+
+Thus, always ensure that the initial configuration fully suits your requirements, as subsequent changes are not considered.
+
+Remember to set `sandbox` to `false` before releasing your app to production. If the production purchase event is sent in sandbox mode, your event won't be validated properly by AppsFlyer.
+### <a id="start"> Start Observing Transactions
+Start the SDK instance to observe transactions. </br>
+
+**⚠️ Please Note**
+> This should be called right after calling the `AppsflyerSdk` [start](https://github.com/AppsFlyerSDK/appsflyer-flutter-plugin/blob/master/doc/BasicIntegration.md#startsdk).
+>  Calling `startObservingTransactions` activates a listener that automatically observes new billing transactions. This includes new and existing subscriptions and new in app purchases.
+>  The best practice is to activate the listener as early as possible.
+```dart
+        // start
+        afPurchaseClient.startObservingTransactions();
+```
+
+### <a id="stop"> Stop Observing Transactions
+Stop the SDK instance from observing transactions. </br>
+**⚠️ Please Note**
+> This should be called if you would like to stop the Connector from listening to billing transactions. This removes the listener and stops observing new transactions.
+> An example for using this API is if the app wishes to stop sending data to AppsFlyer due to changes in the user's consent (opt-out from data sharing). Otherwise, there is no reason to call this method.
+> If you do decide to use it, it should be called right before calling the Android SDK's [`stop`](https://dev.appsflyer.com/hc/docs/android-sdk-reference-appsflyerlib#stop) API
+
+```dart
+        // start
+        afPurchaseClient.stopObservingTransactions();
+```
+
+### <a id="log-subscriptions"> Log Subscriptions
+Enables automatic logging of subscription events. </br>
+Set true to enable, false to disable.</br>
+If this field is not used,  by default, the connector will not record Subscriptions.</br>
+```dart
+final afPurchaseClient = PurchaseConnector(  
+    config: PurchaseConnectorConfiguration(logSubscriptions: true));
+```
+
+### <a id="log-inapps"> Log In App Purchases
+Enables automatic logging of In-App purchase events</br>
+Set true to enable, false to disable.</br>
+If this field is not used,  by default, the connector will not record In App Purchases.</br>
+
+```dart
+final afPurchaseClient = PurchaseConnector(  
+    config: PurchaseConnectorConfiguration(logInApps: true));
+```
+
+
+##  <a id="validation-callbacks"> Register Validation Results Listeners
+You can register listeners to get the validation results once getting a response from AppsFlyer servers to let you know if the purchase was validated successfully.</br>
+
+### <a id="cross-platform-considerations">  Cross-Platform Considerations
+
+The AppsFlyer SDK Flutter plugin acts as a bridge between your Flutter app and the underlying native SDKs provided by AppsFlyer. It's crucial to understand that the native infrastructure of iOS and Android is quite different, and so is the AppsFlyer SDK built on top of them. These differences are reflected in how you would handle callbacks separately for each platform.
+
+In the iOS environment, there is a single callback method  `didReceivePurchaseRevenueValidationInfo`  to handle both subscriptions and in-app purchases. You set this callback using  `setDidReceivePurchaseRevenueValidationInfo`.
+
+On the other hand, Android segregates callbacks for subscriptions and in-app purchases. It provides two separate listener methods -  `setSubscriptionValidationResultListener`  for subscriptions and  `setInAppValidationResultListener`  for in-app purchases. These listener methods register callback handlers for  `OnResponse`  (executed when a successful response is received) and  `OnFailure`  (executed when a failure occurs, including due to a network exception or non-200/OK response from the server).
+
+By splitting the callbacks, you can ensure platform-specific responses and tailor your app's behavior accordingly. It's crucial to consider these nuances to ensure a smooth integration of AppsFlyer SDK into your Flutter application.
+
+### <a id="android-callback-types"> Android Callback Types
+
+| Listener Method               | Description  |
+|-------------------------------|--------------|
+| `onResponse(result: Result?)` | Invoked when we got 200 OK response from the server (INVALID purchase is considered to be successful response and will be returned to this callback) |
+|`onFailure(result: String, error: Throwable?)`|Invoked when we got some network exception or non 200/OK response from the server.|
+
+### <a id="ars-validation-callbacks"> Android - Subscription Validation Result Listener
+
+```dart
+// set listeners for Android  
+afPurchaseClient.setSubscriptionValidationResultListener(  
+    (Map<String, SubscriptionValidationResult>? result) {  
+  // handle subscription validation result for Android  
+}, (String result, JVMThrowable? error) {  
+  // handle subscription validation error for Android  
+});
+```
+
+### <a id="inapps-validation-callbacks"> Android In Apps Validation Result Listener
+```dart
+afPurchaseClient.setInAppValidationResultListener(  
+        (Map<String, InAppPurchaseValidationResult>? result) {  
+      // handle in-app validation result for Android  
+  }, (String result, JVMThrowable? error) {  
+  // handle in-app validation error for Android  
+});
+```
+
+### <a id="ios-callback"> iOS Combined  Validation Result Listener
+```dart
+afPurchaseClient.setDidReceivePurchaseRevenueValidationInfo((validationInfo, error) {  
+  // handle subscription and in-app validation result and errors for iOS  
+});
+```
+
+
+## <a id="testing"> Testing the Integration
+
+With the AppsFlyer SDK, you can select which environment will be used for validation - either **production** or **sandbox**. By default, the environment is set to production. However, while testing your app, you should use the sandbox environment.
+
+### <a id="testing-android"> Android
+
+For Android, testing your integration with the [Google Play Billing Library](https://developer.android.com/google/play/billing/test) should use the sandbox environment.
+
+To set the environment to sandbox in Flutter, just set the `sandbox` parameter in the `PurchaseConnectorConfiguration` to `true` when instantiating `PurchaseConnector`.
+
+Remember to switch the environment back to production (set `sandbox` to `false`) before uploading your app to the Google Play Store.
+
+### <a id="testing-ios"> iOS
+
+To test purchases in an iOS environment on a real device with a TestFlight sandbox account, you also need to set `sandbox` to `true`.
+
+> *IMPORTANT NOTE: Before releasing your app to production please be sure to set `sandbox` to `false`. If a production purchase event is sent in sandbox mode, your event will not be validated properly! *
+
+### <a id="testing-config"> Dart Usage for Android and iOS
+
+For both Android and iOS, you can set the sandbox environment using the `sandbox` parameter in the `PurchaseConnectorConfiguration` when you instantiate `PurchaseConnector` in your Dart code like this:
+
+```dart
+// Testing in a sandbox environment
+final purchaseConnector = PurchaseConnector(
+  PurchaseConnectorConfiguration(sandbox: true)
+);
+```
+
+Remember to set `sandbox` back to `false` before releasing your app to production. If the production purchase event is sent in sandbox mode, your event won't be validated properly.
+
+## <a id="proguard">  ProGuard Rules for Android
+
+If you are using ProGuard to obfuscate your APK for Android, you need to ensure that it doesn't interfere with the functionality of AppsFlyer SDK and its Purchase Connector feature.
+
+Add following keep rules to your  `proguard-rules.pro`  file:
+
+```groovy
+-keep  class  com.appsflyer.** { *; }  
+-keep  class  kotlin.jvm.internal.Intrinsics{ *; }  
+-keep  class  kotlin.collections.**{ *; }
+```
+
+## <a id="example"> Full Code Example
+```dart
+PurchaseConnectorConfiguration config = PurchaseConnectorConfiguration(  
+    logSubscriptions: true, logInApps: true, sandbox: false);  
+final afPurchaseClient = PurchaseConnector(config: config);  
+  
+// set listeners for Android  
+afPurchaseClient.setSubscriptionValidationResultListener(  
+    (Map<String, SubscriptionValidationResult>? result) {  
+  // handle subscription validation result for Android  
+  result?.entries.forEach((element) {  
+    debugPrint(  
+        "Subscription Validation Result\n\t Token: ${element.key}\n\tresult: ${jsonEncode(element.value.toJson())}");  
+  });  
+}, (String result, JVMThrowable? error) {  
+  // handle subscription validation error for Android  
+  var errMsg = error != null ? jsonEncode(error.toJson()) : null;  
+  debugPrint(  
+      "Subscription Validation Result\n\t result: $result\n\terror: $errMsg");  
+});  
+  
+afPurchaseClient.setInAppValidationResultListener(  
+    (Map<String, InAppPurchaseValidationResult>? result) {  
+  // handle in-app validation result for Android  
+  result?.entries.forEach((element) {  
+    debugPrint(  
+        "In App Validation Result\n\t Token: ${element.key}\n\tresult: ${jsonEncode(element.value.toJson())}");  
+  });  
+}, (String result, JVMThrowable? error) {  
+  // handle in-app validation error for Android  
+  var errMsg = error != null ? jsonEncode(error.toJson()) : null;  
+  debugPrint(  
+      "In App Validation Result\n\t result: $result\n\terror: $errMsg");  
+});  
+  
+// set listener for iOS  
+afPurchaseClient  
+    .setDidReceivePurchaseRevenueValidationInfo((validationInfo, error) {  
+  var validationInfoMsg =  
+      validationInfo != null ? jsonEncode(validationInfo) : null;  
+  var errMsg = error != null ? jsonEncode(error.toJson()) : null;  
+  debugPrint(  
+      "iOS Validation Result\n\t validationInfo: $validationInfoMsg\n\terror: $errMsg");  
+  // handle subscription and in-app validation result and errors for iOS  
+});  
+  
+// start  
+afPurchaseClient.startObservingTransactions();
+```
\ No newline at end of file
diff --git a/ios/PurchaseConnector/PurchaseConnectorPlugin.swift b/ios/PurchaseConnector/PurchaseConnectorPlugin.swift
new file mode 100644
index 0000000..dfd60f4
--- /dev/null
+++ b/ios/PurchaseConnector/PurchaseConnectorPlugin.swift
@@ -0,0 +1,170 @@
+//
+//  PurchaseConnectorPlugin.swift
+//  appsflyer_sdk
+//
+//  Created by Paz Lavi on 11/06/2024.
+//
+import Foundation
+import PurchaseConnector
+import Flutter
+
+/// `PurchaseConnectorPlugin` is a `FlutterPlugin` implementation that acts as the bridge between Flutter and the PurchaseConnector iOS SDK.
+/// This class is responsible for processing incoming method calls from the Dart layer (via a MethodChannel) and translating these calls to the appropriate tasks in the PurchaseConnector SDK.
+@objc public class PurchaseConnectorPlugin : NSObject, FlutterPlugin {
+    
+    /// Methods channel name constant to be used across plugin.
+    private static let  AF_PURCHASE_CONNECTOR_CHANNEL = "af-purchase-connector"
+    
+    /// Singleton instance of `PurchaseConnectorPlugin` ensures this plugin acts as a centralized point of contact for all method calls.
+    internal static let shared = PurchaseConnectorPlugin()
+    
+    /// An instance of `PurchaseConnector`.
+    /// This will be intentionally set to `nil` by default and will be initialized once we call the `configure` method via Flutter.
+    private var connector: PurchaseConnector? = nil
+    
+    /// Instance of method channel providing a bridge to Dart code.
+    private var methodChannel: FlutterMethodChannel? = nil
+    
+    private var logOptions: AutoLogPurchaseRevenueOptions = []
+    
+    /// Constants used in method channel for Flutter calls.
+    private let logSubscriptionsKey = "logSubscriptions"
+    private let logInAppsKey = "logInApps"
+    private let sandboxKey = "sandbox"
+    
+    /// Private constructor, used to prevent direct instantiation of this class and ensure singleton behaviour.
+    private override init() {}
+
+    /// Mandatory method needed to register the plugin with iOS part of Flutter app.
+    public static func register(with registrar: FlutterPluginRegistrar) {
+        /// Create a new method channel with the registrar.
+            shared.methodChannel =  FlutterMethodChannel(name: AF_PURCHASE_CONNECTOR_CHANNEL, binaryMessenger: registrar.messenger())
+            shared.methodChannel!.setMethodCallHandler(shared.methodCallHandler)
+        
+    }
+
+    /// Method called when a Flutter method call occurs. It handles and routes flutter method invocations.
+    private func methodCallHandler(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        switch(call.method) {
+        /// Match incoming flutter calls from Dart side to its corresponding native method.
+        case "configure":
+            configure(call: call, result: result)
+        case "startObservingTransactions":
+            startObservingTransactions(result: result)
+        case "stopObservingTransactions":
+            stopObservingTransactions(result: result)
+        default:
+            /// This condition handles an error scenario where the method call doesn't match any predefined cases.
+            result(FlutterMethodNotImplemented)
+        }
+    }
+  
+    /// This method corresponds to the 'configure' call from Flutter and initiates the PurchaseConnector instance.
+    private func configure(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        /// Perform a guard check to ensure that we do not reconfigure an existing connector.
+        guard connector == nil else {
+            result(FlutterError(code: "401", message: "Connector already configured", details: nil))
+            return
+        }
+        
+        /// Obtain a shared instance of PurchaseConnector
+        connector = PurchaseConnector.shared()
+
+        /// Extract all the required parameters from Flutter arguments
+        let arguments = call.arguments as? [String: Any]
+        let logSubscriptions = arguments?[logSubscriptionsKey] as? Bool ?? false
+        let logInApps = arguments?[logInAppsKey] as? Bool ?? false
+        let sandbox = arguments?[sandboxKey] as? Bool ?? false
+
+        /// Define an options variable to manage enabled options.
+        var options: AutoLogPurchaseRevenueOptions = []
+        
+        /// Based on the arguments, insert the corresponding options.
+        if logSubscriptions {
+            options.insert(.autoRenewableSubscriptions)
+        }
+        if logInApps {
+            options.insert(.inAppPurchases)
+        }
+        
+        /// Update the PurchaseConnector instance with these options.
+        connector!.autoLogPurchaseRevenue = options
+        logOptions = options
+        connector!.isSandbox = sandbox
+        connector!.purchaseRevenueDelegate = self
+        
+        /// Report a successful operation back to Dart.
+        result(nil)
+    }
+
+    /// This function starts the process of observing transactions in the iOS App Store.
+    private  func startObservingTransactions(result: @escaping FlutterResult) {
+        connectorOperation(result: result) { connector in
+            // From the docs:  If you called stopObservingTransactions API, set the autoLogPurchaseRevenue value before you call startObservingTransactions next time.
+            connector.autoLogPurchaseRevenue = self.logOptions
+            connector.startObservingTransactions()
+
+        }
+    }
+
+    /// This function stops the process of observing transactions in the iOS App Store.
+    private func stopObservingTransactions(result: @escaping FlutterResult) {
+        connectorOperation(result: result) { connector in
+            connector.stopObservingTransactions()
+        }
+    }
+
+    /// Helper function used to extract common logic for operations on the connector.
+    private  func connectorOperation(result: @escaping FlutterResult, operation: @escaping ((PurchaseConnector) -> Void)) {
+        guard connector != nil else {
+            result(FlutterError(code: "404", message: "Connector not configured, did you called `configure` first?", details: nil))
+            return
+        }
+        /// Perform the operation with the current connector
+        operation(connector!)
+        
+        result(nil)
+    }
+}
+
+/// Extension enabling `PurchaseConnectorPlugin` to conform to `PurchaseRevenueDelegate`
+extension PurchaseConnectorPlugin:  PurchaseRevenueDelegate {
+    /// Implementation of the `didReceivePurchaseRevenueValidationInfo` delegate method.
+    /// When the validation info comes back after a purchase, it is reported back to the Flutter via the method channel.
+    public func didReceivePurchaseRevenueValidationInfo(_ validationInfo: [AnyHashable : Any]?, error: Error?) {
+        var resMap: [AnyHashable : Any?] = [
+            "validationInfo": validationInfo,
+            "error" : error?.asDictionary
+        ]
+        DispatchQueue.main.async {
+            self.methodChannel?.invokeMethod("didReceivePurchaseRevenueValidationInfo", arguments: resMap.toJSONString())
+        }
+    }
+}
+
+/// Extending `Error` to have a dictionary representation function. `asDictionary` will turn the current error instance into a dictionary containing `localizedDescription`, `domain` and `code` properties.
+extension Error {
+    var asDictionary: [String: Any] {
+        var errorMap: [String: Any] = ["localizedDescription": self.localizedDescription]
+        if let nsError = self as? NSError {
+            errorMap["domain"] = nsError.domain
+            errorMap["code"] = nsError.code
+        }
+        return errorMap
+    }
+}
+
+extension Dictionary {
+       
+   var jsonData: Data? {
+      return try? JSONSerialization.data(withJSONObject: self, options: [.prettyPrinted])
+   }
+       
+   func toJSONString() -> String? {
+      if let jsonData = jsonData {
+         let jsonString = String(data: jsonData, encoding: .utf8)
+         return jsonString
+      }
+      return nil
+   }
+}
diff --git a/ios/appsflyer_sdk.podspec b/ios/appsflyer_sdk.podspec
index 6a2631e..c48c2b8 100644
--- a/ios/appsflyer_sdk.podspec
+++ b/ios/appsflyer_sdk.podspec
@@ -1,25 +1,35 @@
-#
-# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
-#
 Pod::Spec.new do |s|
   s.name             = 'appsflyer_sdk'
-  s.version          = '6.16.2'
+  s.version          = '6.15.3'
   s.summary          = 'AppsFlyer Integration for Flutter'
-  s.description      = <<-DESC
-AppsFlyer is the market leader in mobile advertising attribution & analytics, helping marketers to pinpoint their targeting, optimize their ad spend and boost their ROI.
-                       DESC
+  s.description      = 'AppsFlyer is the market leader in mobile advertising attribution & analytics, helping marketers to pinpoint their targeting, optimize their ad spend and boost their ROI.'
   s.homepage         = 'https://github.com/AppsFlyerSDK/flutter_appsflyer_sdk'
   s.license          = { :type => 'MIT', :file => '../LICENSE' }
   s.author           = { "Appsflyer" => "build@appsflyer.com" }
   s.source           = { :git => "https://github.com/AppsFlyerSDK/flutter_appsflyer_sdk.git", :tag => s.version.to_s }
-
-
+  
   s.ios.deployment_target = '12.0'
   s.requires_arc = true
   s.static_framework = true
+  if defined?($AppsFlyerPurchaseConnector)
+    s.default_subspecs = 'Core', 'PurchaseConnector' # add this line
+  else
+    s.default_subspecs = 'Core' # add this line
+  end
+
+  s.subspec 'Core' do |ss|
+    ss.source_files = 'Classes/**/*'
+    ss.public_header_files = 'Classes/**/*.h'
+    ss.dependency 'Flutter'
+    ss.ios.dependency 'AppsFlyerFramework','6.15.3'
+  end
+
+  s.subspec 'PurchaseConnector' do |ss|
+    ss.dependency 'Flutter'
+    ss.ios.dependency 'PurchaseConnector', '6.15.3'
+    ss.source_files = 'PurchaseConnector/**/*'
+    ss.public_header_files = 'PurchaseConnector/**/*.h'
   
-  s.source_files = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
-  s.dependency 'Flutter'
-  s.ios.dependency 'AppsFlyerFramework','6.16.2'
+    ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) ENABLE_PURCHASE_CONNECTOR=1' }
+  end
 end
diff --git a/lib/appsflyer_sdk.dart b/lib/appsflyer_sdk.dart
index cee5ef4..ff9df5c 100644
--- a/lib/appsflyer_sdk.dart
+++ b/lib/appsflyer_sdk.dart
@@ -7,14 +7,28 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import 'package:json_annotation/json_annotation.dart';
+
 import 'src/callbacks.dart';
 
-part 'src/appsflyer_ad_revenue_data.dart';
 part 'src/appsflyer_constants.dart';
-part 'src/appsflyer_consent.dart';
 part 'src/appsflyer_invite_link_params.dart';
 part 'src/appsflyer_options.dart';
-part 'src/appsflyer_request_listener.dart';
 part 'src/appsflyer_sdk.dart';
 part 'src/udl/deep_link_result.dart';
 part 'src/udl/deeplink.dart';
+part 'src/purchase_connector/purchase_connector.dart';
+part 'src/purchase_connector/connector_callbacks.dart';
+part 'src/purchase_connector/missing_configuration_exception.dart';
+part 'src/purchase_connector/purchase_connector_configuration.dart';
+part 'src/purchase_connector/models/subscription_purchase.dart';
+part 'src/purchase_connector/models/in_app_purchase_validation_result.dart';
+part 'src/purchase_connector/models/product_purchase.dart';
+part 'src/purchase_connector/models/subscription_validation_result.dart';
+part 'src/purchase_connector/models/validation_failure_data.dart';
+part 'src/purchase_connector/models/jvm_throwable.dart';
+part 'src/purchase_connector/models/ios_error.dart';
+part 'src/appsflyer_consent.dart';
+part 'src/appsflyer_request_listener.dart';
+part 'appsflyer_sdk.g.dart';
+part 'src/appsflyer_ad_revenue_data.dart';
diff --git a/lib/src/purchase_connector/connector_callbacks.dart b/lib/src/purchase_connector/connector_callbacks.dart
new file mode 100644
index 0000000..c908cfe
--- /dev/null
+++ b/lib/src/purchase_connector/connector_callbacks.dart
@@ -0,0 +1,18 @@
+part of appsflyer_sdk;
+
+/// Type definition for a general purpose listener.
+typedef PurchaseConnectorListener = Function(dynamic);
+/// Type definition for a listener which gets called when the `PurchaseConnectorImpl` receives purchase revenue validation info for iOS.
+typedef DidReceivePurchaseRevenueValidationInfo = Function(
+    Map<String, dynamic>? validationInfo, IosError? error);
+/// Invoked when a 200 OK response is received from the server.
+/// Note: An INVALID purchase is considered to be a successful response and will also be returned by this callback.
+///
+/// [result] Server's response.
+typedef OnResponse<T> = Function(Map<String, T>? result);
+
+/// Invoked when a network exception occurs or a non 200/OK response is received from the server.
+///
+/// [result] The server's response.
+/// [error] The exception that occurred during execution.
+typedef OnFailure = Function(String result, JVMThrowable? error);
diff --git a/lib/src/purchase_connector/missing_configuration_exception.dart b/lib/src/purchase_connector/missing_configuration_exception.dart
new file mode 100644
index 0000000..eae2367
--- /dev/null
+++ b/lib/src/purchase_connector/missing_configuration_exception.dart
@@ -0,0 +1,11 @@
+part of appsflyer_sdk;
+/// Exception thrown when the configuration is missing.
+class MissingConfigurationException implements Exception {
+  final String message;
+
+  MissingConfigurationException(
+      {this.message = AppsflyerConstants.MISSING_CONFIGURATION_EXCEPTION_MSG});
+
+  @override
+  String toString() => 'ConfigurationException: $message';
+}
diff --git a/lib/src/purchase_connector/models/in_app_purchase_validation_result.dart b/lib/src/purchase_connector/models/in_app_purchase_validation_result.dart
new file mode 100644
index 0000000..0846a18
--- /dev/null
+++ b/lib/src/purchase_connector/models/in_app_purchase_validation_result.dart
@@ -0,0 +1,33 @@
+part of appsflyer_sdk;
+
+@JsonSerializable()
+class InAppPurchaseValidationResult {
+
+  bool success;
+  ProductPurchase? productPurchase;
+  ValidationFailureData? failureData;
+
+  InAppPurchaseValidationResult(
+      this.success,
+      this.productPurchase,
+      this.failureData
+      );
+
+
+
+  factory InAppPurchaseValidationResult.fromJson(Map<String, dynamic> json) => _$InAppPurchaseValidationResultFromJson(json);
+
+  Map<String, dynamic> toJson() => _$InAppPurchaseValidationResultToJson(this);
+
+}
+
+@JsonSerializable()
+class InAppPurchaseValidationResultMap{
+  Map<String, InAppPurchaseValidationResult> result;
+
+  InAppPurchaseValidationResultMap(this.result);
+  factory InAppPurchaseValidationResultMap.fromJson(Map<String, dynamic> json) => _$InAppPurchaseValidationResultMapFromJson(json);
+
+  Map<String, dynamic> toJson() => _$InAppPurchaseValidationResultMapToJson(this);
+
+}
diff --git a/lib/src/purchase_connector/models/ios_error.dart b/lib/src/purchase_connector/models/ios_error.dart
new file mode 100644
index 0000000..aa67106
--- /dev/null
+++ b/lib/src/purchase_connector/models/ios_error.dart
@@ -0,0 +1,15 @@
+part of appsflyer_sdk;
+
+@JsonSerializable()
+class IosError{
+  String localizedDescription;
+  String domain;
+  int code;
+
+
+  IosError(this.localizedDescription, this.domain, this.code);
+
+  factory IosError.fromJson(Map<String, dynamic> json) => _$IosErrorFromJson(json);
+
+  Map<String, dynamic> toJson() => _$IosErrorToJson(this);
+}
\ No newline at end of file
diff --git a/lib/src/purchase_connector/models/jvm_throwable.dart b/lib/src/purchase_connector/models/jvm_throwable.dart
new file mode 100644
index 0000000..04fb07e
--- /dev/null
+++ b/lib/src/purchase_connector/models/jvm_throwable.dart
@@ -0,0 +1,16 @@
+part of appsflyer_sdk;
+
+@JsonSerializable()
+class JVMThrowable{
+  String type;
+  String message;
+  String stacktrace;
+  JVMThrowable? cause;
+
+  JVMThrowable(this.type, this.message, this.stacktrace, this.cause);
+
+  factory JVMThrowable.fromJson(Map<String, dynamic> json) => _$JVMThrowableFromJson(json);
+
+  Map<String, dynamic> toJson() => _$JVMThrowableToJson(this);
+
+}
\ No newline at end of file
diff --git a/lib/src/purchase_connector/models/product_purchase.dart b/lib/src/purchase_connector/models/product_purchase.dart
new file mode 100644
index 0000000..e6e3ceb
--- /dev/null
+++ b/lib/src/purchase_connector/models/product_purchase.dart
@@ -0,0 +1,44 @@
+part of appsflyer_sdk;
+
+@JsonSerializable()
+class ProductPurchase {
+
+  String kind;
+  String purchaseTimeMillis;
+  int purchaseState;
+  int consumptionState;
+  String developerPayload;
+  String orderId;
+  int purchaseType;
+  int acknowledgementState;
+  String purchaseToken;
+  String productId;
+  int quantity;
+  String obfuscatedExternalAccountId;
+  String obfuscatedExternalProfileId;
+  String regionCode;
+
+  ProductPurchase(
+      this.kind,
+      this.purchaseTimeMillis,
+      this.purchaseState,
+      this.consumptionState,
+      this.developerPayload,
+      this.orderId,
+      this.purchaseType,
+      this.acknowledgementState,
+      this.purchaseToken,
+      this.productId,
+      this.quantity,
+      this.obfuscatedExternalAccountId,
+      this.obfuscatedExternalProfileId,
+      this.regionCode
+      );
+
+
+
+  factory ProductPurchase.fromJson(Map<String, dynamic> json) => _$ProductPurchaseFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ProductPurchaseToJson(this);
+
+}
\ No newline at end of file
diff --git a/lib/src/purchase_connector/models/subscription_purchase.dart b/lib/src/purchase_connector/models/subscription_purchase.dart
new file mode 100644
index 0000000..55ede1e
--- /dev/null
+++ b/lib/src/purchase_connector/models/subscription_purchase.dart
@@ -0,0 +1,343 @@
+part of appsflyer_sdk;
+
+@JsonSerializable()
+class SubscriptionPurchase {
+
+  String acknowledgementState;
+  CanceledStateContext? canceledStateContext;
+  ExternalAccountIdentifiers? externalAccountIdentifiers;
+  String kind;
+  String latestOrderId;
+  List<SubscriptionPurchaseLineItem> lineItems;
+  String? linkedPurchaseToken;
+  PausedStateContext? pausedStateContext;
+  String regionCode;
+  String startTime;
+  SubscribeWithGoogleInfo? subscribeWithGoogleInfo;
+  String subscriptionState;
+  TestPurchase? testPurchase;
+
+  SubscriptionPurchase(
+      this.acknowledgementState,
+      this.canceledStateContext,
+      this.externalAccountIdentifiers,
+      this.kind,
+      this.latestOrderId,
+      this.lineItems,
+      this.linkedPurchaseToken,
+      this.pausedStateContext,
+      this.regionCode,
+      this.startTime,
+      this.subscribeWithGoogleInfo,
+      this.subscriptionState,
+      this.testPurchase
+      );
+
+
+
+  factory SubscriptionPurchase.fromJson(Map<String, dynamic> json) => _$SubscriptionPurchaseFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SubscriptionPurchaseToJson(this);
+
+}
+
+
+@JsonSerializable()
+class CanceledStateContext {
+
+  DeveloperInitiatedCancellation? developerInitiatedCancellation;
+  ReplacementCancellation? replacementCancellation;
+  SystemInitiatedCancellation? systemInitiatedCancellation;
+  UserInitiatedCancellation? userInitiatedCancellation;
+
+  CanceledStateContext(
+      this.developerInitiatedCancellation,
+      this.replacementCancellation,
+      this.systemInitiatedCancellation,
+      this.userInitiatedCancellation
+      );
+
+
+
+  factory CanceledStateContext.fromJson(Map<String, dynamic> json) => _$CanceledStateContextFromJson(json);
+
+  Map<String, dynamic> toJson() => _$CanceledStateContextToJson(this);
+
+}
+
+@JsonSerializable()
+class DeveloperInitiatedCancellation{
+  DeveloperInitiatedCancellation();
+  factory DeveloperInitiatedCancellation.fromJson(Map<String, dynamic> json) => _$DeveloperInitiatedCancellationFromJson(json);
+
+  Map<String, dynamic> toJson() => _$DeveloperInitiatedCancellationToJson(this);
+}
+
+@JsonSerializable()
+class ReplacementCancellation{
+  ReplacementCancellation();
+  factory ReplacementCancellation.fromJson(Map<String, dynamic> json) => _$ReplacementCancellationFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ReplacementCancellationToJson(this);
+}
+
+@JsonSerializable()
+class SystemInitiatedCancellation{
+  SystemInitiatedCancellation();
+  factory SystemInitiatedCancellation.fromJson(Map<String, dynamic> json) => _$SystemInitiatedCancellationFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SystemInitiatedCancellationToJson(this);
+}
+
+
+@JsonSerializable()
+class UserInitiatedCancellation {
+
+  CancelSurveyResult? cancelSurveyResult;
+  String cancelTime;
+
+  UserInitiatedCancellation(
+      this.cancelSurveyResult,
+      this.cancelTime
+      );
+
+
+
+  factory UserInitiatedCancellation.fromJson(Map<String, dynamic> json) => _$UserInitiatedCancellationFromJson(json);
+
+  Map<String, dynamic> toJson() => _$UserInitiatedCancellationToJson(this);
+
+}
+
+@JsonSerializable()
+class CancelSurveyResult {
+
+  String reason;
+  String reasonUserInput;
+
+  CancelSurveyResult(
+      this.reason,
+      this.reasonUserInput
+      );
+
+
+
+  factory CancelSurveyResult.fromJson(Map<String, dynamic> json) => _$CancelSurveyResultFromJson(json);
+
+  Map<String, dynamic> toJson() => _$CancelSurveyResultToJson(this);
+
+}
+
+@JsonSerializable()
+class ExternalAccountIdentifiers {
+
+  String externalAccountId;
+  String obfuscatedExternalAccountId;
+  String obfuscatedExternalProfileId;
+
+  ExternalAccountIdentifiers(
+      this.externalAccountId,
+      this.obfuscatedExternalAccountId,
+      this.obfuscatedExternalProfileId
+      );
+
+
+
+  factory ExternalAccountIdentifiers.fromJson(Map<String, dynamic> json) => _$ExternalAccountIdentifiersFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ExternalAccountIdentifiersToJson(this);
+
+}
+
+@JsonSerializable()
+class SubscriptionPurchaseLineItem {
+
+  AutoRenewingPlan? autoRenewingPlan;
+  DeferredItemReplacement? deferredItemReplacement;
+  String expiryTime;
+  OfferDetails? offerDetails;
+  PrepaidPlan? prepaidPlan;
+  String productId;
+
+  SubscriptionPurchaseLineItem(
+      this.autoRenewingPlan,
+      this.deferredItemReplacement,
+      this.expiryTime,
+      this.offerDetails,
+      this.prepaidPlan,
+      this.productId
+      );
+
+
+
+  factory SubscriptionPurchaseLineItem.fromJson(Map<String, dynamic> json) => _$SubscriptionPurchaseLineItemFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SubscriptionPurchaseLineItemToJson(this);
+
+}
+
+@JsonSerializable()
+class OfferDetails {
+
+  List<String>? offerTags;
+  String basePlanId;
+  String? offerId;
+
+  OfferDetails(
+      this.offerTags,
+      this.basePlanId,
+      this.offerId
+      );
+
+
+
+  factory OfferDetails.fromJson(Map<String, dynamic> json) => _$OfferDetailsFromJson(json);
+
+  Map<String, dynamic> toJson() => _$OfferDetailsToJson(this);
+
+}
+
+@JsonSerializable()
+class AutoRenewingPlan {
+
+  bool? autoRenewEnabled;
+  SubscriptionItemPriceChangeDetails? priceChangeDetails;
+
+  AutoRenewingPlan(
+      this.autoRenewEnabled,
+      this.priceChangeDetails
+      );
+
+
+
+  factory AutoRenewingPlan.fromJson(Map<String, dynamic> json) => _$AutoRenewingPlanFromJson(json);
+
+  Map<String, dynamic> toJson() => _$AutoRenewingPlanToJson(this);
+
+}
+
+@JsonSerializable()
+class SubscriptionItemPriceChangeDetails {
+
+  String expectedNewPriceChargeTime;
+  Money? newPrice;
+  String priceChangeMode;
+  String priceChangeState;
+
+  SubscriptionItemPriceChangeDetails(
+      this.expectedNewPriceChargeTime,
+      this.newPrice,
+      this.priceChangeMode,
+      this.priceChangeState
+      );
+
+
+
+  factory SubscriptionItemPriceChangeDetails.fromJson(Map<String, dynamic> json) => _$SubscriptionItemPriceChangeDetailsFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SubscriptionItemPriceChangeDetailsToJson(this);
+
+}
+
+@JsonSerializable()
+class Money {
+
+  String currencyCode;
+  int nanos;
+  int units;
+
+  Money(
+      this.currencyCode,
+      this.nanos,
+      this.units
+      );
+
+
+
+  factory Money.fromJson(Map<String, dynamic> json) => _$MoneyFromJson(json);
+
+  Map<String, dynamic> toJson() => _$MoneyToJson(this);
+
+}
+@JsonSerializable()
+class DeferredItemReplacement {
+
+  String productId;
+
+  DeferredItemReplacement(
+      this.productId
+      );
+
+
+
+  factory DeferredItemReplacement.fromJson(Map<String, dynamic> json) => _$DeferredItemReplacementFromJson(json);
+
+  Map<String, dynamic> toJson() => _$DeferredItemReplacementToJson(this);
+
+}
+
+@JsonSerializable()
+class PrepaidPlan {
+
+  String? allowExtendAfterTime;
+
+  PrepaidPlan(
+      this.allowExtendAfterTime
+      );
+
+
+
+  factory PrepaidPlan.fromJson(Map<String, dynamic> json) => _$PrepaidPlanFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PrepaidPlanToJson(this);
+
+}
+
+@JsonSerializable()
+class PausedStateContext {
+
+  String autoResumeTime;
+
+  PausedStateContext(
+      this.autoResumeTime
+      );
+
+
+
+  factory PausedStateContext.fromJson(Map<String, dynamic> json) => _$PausedStateContextFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PausedStateContextToJson(this);
+
+}
+@JsonSerializable()
+class SubscribeWithGoogleInfo {
+
+  String emailAddress;
+  String familyName;
+  String givenName;
+  String profileId;
+  String profileName;
+
+  SubscribeWithGoogleInfo(
+      this.emailAddress,
+      this.familyName,
+      this.givenName,
+      this.profileId,
+      this.profileName
+      );
+
+
+
+  factory SubscribeWithGoogleInfo.fromJson(Map<String, dynamic> json) => _$SubscribeWithGoogleInfoFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SubscribeWithGoogleInfoToJson(this);
+
+}
+
+@JsonSerializable()
+class TestPurchase{
+  TestPurchase();
+  factory TestPurchase.fromJson(Map<String, dynamic> json) => _$TestPurchaseFromJson(json);
+
+  Map<String, dynamic> toJson() => _$TestPurchaseToJson(this);
+}
\ No newline at end of file
diff --git a/lib/src/purchase_connector/models/subscription_validation_result.dart b/lib/src/purchase_connector/models/subscription_validation_result.dart
new file mode 100644
index 0000000..b929417
--- /dev/null
+++ b/lib/src/purchase_connector/models/subscription_validation_result.dart
@@ -0,0 +1,32 @@
+part of appsflyer_sdk;
+
+@JsonSerializable()
+class SubscriptionValidationResult {
+
+  bool success;
+  SubscriptionPurchase? subscriptionPurchase;
+  ValidationFailureData? failureData;
+
+  SubscriptionValidationResult(
+      this.success,
+      this.subscriptionPurchase,
+      this.failureData
+      );
+
+
+
+  factory SubscriptionValidationResult.fromJson(Map<String, dynamic> json) => _$SubscriptionValidationResultFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SubscriptionValidationResultToJson(this);
+
+}
+
+@JsonSerializable()
+class SubscriptionValidationResultMap{
+  Map<String, SubscriptionValidationResult> result;
+
+  SubscriptionValidationResultMap(this.result);
+  factory SubscriptionValidationResultMap.fromJson(Map<String, dynamic> json) => _$SubscriptionValidationResultMapFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SubscriptionValidationResultMapToJson(this);
+}
diff --git a/lib/src/purchase_connector/models/validation_failure_data.dart b/lib/src/purchase_connector/models/validation_failure_data.dart
new file mode 100644
index 0000000..57b3d13
--- /dev/null
+++ b/lib/src/purchase_connector/models/validation_failure_data.dart
@@ -0,0 +1,20 @@
+part of appsflyer_sdk;
+
+@JsonSerializable()
+class ValidationFailureData {
+
+  int status;
+  String description;
+
+  ValidationFailureData(
+      this.status,
+      this.description
+      );
+
+
+
+  factory ValidationFailureData.fromJson(Map<String, dynamic> json) => _$ValidationFailureDataFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ValidationFailureDataToJson(this);
+
+}
\ No newline at end of file
diff --git a/lib/src/purchase_connector/purchase_connector.dart b/lib/src/purchase_connector/purchase_connector.dart
new file mode 100644
index 0000000..e962823
--- /dev/null
+++ b/lib/src/purchase_connector/purchase_connector.dart
@@ -0,0 +1,254 @@
+part of appsflyer_sdk;
+
+/// Interface representing a purchase connector.
+abstract class PurchaseConnector {
+  /// Starts observing transactions.
+  void startObservingTransactions();
+
+  /// Stops observing transactions.
+  void stopObservingTransactions();
+
+  /// Sets the listener for Android subscription validation results.
+  ///
+  /// [onResponse] Function to be executed when a successful response is received.
+  /// [onFailure] Function to be executed when a failure occurs (network exception or non 200/OK response from the server).
+  void setSubscriptionValidationResultListener(
+      OnResponse<SubscriptionValidationResult>? onResponse,
+      OnFailure? onFailure);
+
+  /// Sets the listener for Android in-app validation results.
+  ///
+  /// [onResponse] Function to be executed when a successful response is received.
+  /// [onFailure] Function to be executed when a failure occurs (network exception or non 200/OK response from the server).
+
+  void setInAppValidationResultListener(
+      OnResponse<InAppPurchaseValidationResult>? onResponse,
+      OnFailure? onFailure);
+
+  /// Sets the listener for iOS subscription and  in-app validation results.
+  /// Parameter:
+  ///   [callback] the function to be executed when `DidReceivePurchaseRevenueValidationInfo` is called.
+  void setDidReceivePurchaseRevenueValidationInfo(
+      DidReceivePurchaseRevenueValidationInfo? callback);
+
+  /// Creates a new PurchaseConnector instance.
+  /// Parameter:
+  ///   [config] the configuration to be used when creating a new `PurchaseConnector` instance.
+  factory PurchaseConnector({PurchaseConnectorConfiguration? config}) =>
+      _PurchaseConnectorImpl(config: config);
+}
+
+/// The implementation of the PurchaseConnector.
+///
+/// This class is responsible for establishing a connection with Appsflyer purchase connector,
+/// starting/stopping observing transactions, setting listeners for various validation results.
+class _PurchaseConnectorImpl implements PurchaseConnector {
+  /// Singleton instance of the PurchaseConnectorImpl.
+  static _PurchaseConnectorImpl? _instance;
+
+  /// Method channel to communicate with the Appsflyer Purchase Connector.
+  final MethodChannel _methodChannel;
+
+  /// Response handler for SubscriptionValidationResult (Android).
+  OnResponse<SubscriptionValidationResult>? _arsOnResponse;
+
+  /// Failure handler for SubscriptionValidationResult (Android).
+  OnFailure? _arsOnFailure;
+
+  /// Response handler for InAppPurchaseValidationResult (Android).
+  OnResponse<InAppPurchaseValidationResult>? _viapOnResponse;
+
+  /// Failure handler for InAppPurchaseValidationResult (Android).
+  OnFailure? _viapOnFailure;
+
+  /// Callback handler for receiving validation info for iOS.
+  DidReceivePurchaseRevenueValidationInfo?
+      _didReceivePurchaseRevenueValidationInfo;
+
+  /// Internal constructor. Initializes the instance and sets up method call handler.
+  _PurchaseConnectorImpl._internal(
+      this._methodChannel, PurchaseConnectorConfiguration config) {
+    _methodChannel.setMethodCallHandler(_methodCallHandler);
+    _methodChannel.invokeMethod(AppsflyerConstants.CONFIGURE_KEY, {
+      AppsflyerConstants.LOG_SUBS_KEY: config.logSubscriptions,
+      AppsflyerConstants.LOG_IN_APP_KEY: config.logInApps,
+      AppsflyerConstants.SANDBOX_KEY: config.sandbox,
+    });
+  }
+
+  /// Factory constructor.
+  ///
+  /// This factory ensures that only a single instance of `PurchaseConnectorImpl` is used throughout the program
+  /// by implementing the Singleton design pattern. If an instance already exists, it's returned.
+  ///
+  /// The [config] parameter is optional and is used only when creating the first instance of `PurchaseConnectorImpl`.
+  /// Once an instance is created, the same instance will be returned in subsequent calls, and the [config]
+  /// parameter will be ignored. Thus, it's valid to call this factory without a config if an instance already exists.
+  ///
+  /// If there is no existing instance and the [config] is not provided, a `MissingConfigurationException` will be thrown.
+  factory _PurchaseConnectorImpl({PurchaseConnectorConfiguration? config}) {
+    if (_instance == null && config == null) {
+      // no instance exist and config not provided. We Can't create instance without config
+      throw MissingConfigurationException();
+    } else if (_instance == null && config != null) {
+      // no existing instance. Create new instance and apply config
+      MethodChannel methodChannel =
+          const MethodChannel(AppsflyerConstants.AF_PURCHASE_CONNECTOR_CHANNEL);
+      _instance = _PurchaseConnectorImpl._internal(methodChannel, config);
+    } else if (_instance != null && config != null) {
+      debugPrint(AppsflyerConstants.RE_CONFIGURE_ERROR_MSG);
+    }
+    return _instance!;
+  }
+
+  /// Starts observing the transactions.
+  @override
+  void startObservingTransactions() {
+    _methodChannel.invokeMethod("startObservingTransactions");
+  }
+
+  /// Stops observing the transactions.
+  @override
+  void stopObservingTransactions() {
+    _methodChannel.invokeMethod("stopObservingTransactions");
+  }
+
+  /// Sets the function to be executed when iOS validation info is received.
+  @override
+  void setDidReceivePurchaseRevenueValidationInfo(
+      DidReceivePurchaseRevenueValidationInfo? callback) {
+    _didReceivePurchaseRevenueValidationInfo = callback;
+  }
+
+  /// Sets the listener for Android in-app validation results.
+  ///
+  /// [onResponse] Function to be executed when a successful response is received.
+  /// [onFailure] Function to be executed when a failure occurs (network exception or non 200/OK response from the server).
+  @override
+  void setInAppValidationResultListener(
+      OnResponse<InAppPurchaseValidationResult>? onResponse,
+      OnFailure? onFailure) {
+    _viapOnResponse = onResponse;
+    _viapOnFailure = onFailure;
+  }
+
+  /// Sets the listener for Android subscription validation results.
+  ///
+  /// [onResponse] Function to be executed when a successful response is received.
+  /// [onFailure] Function to be executed when a failure occurs (network exception or non 200/OK response from the server).
+  @override
+  void setSubscriptionValidationResultListener(
+      OnResponse<SubscriptionValidationResult>? onResponse,
+      OnFailure? onFailure) {
+    _arsOnResponse = onResponse;
+    _arsOnFailure = onFailure;
+  }
+
+  /// Method call handler for different operations. Called by the _methodChannel.
+  Future<void> _methodCallHandler(MethodCall call) async {
+    dynamic callMap = jsonDecode(call.arguments);
+    switch (call.method) {
+      case AppsflyerConstants
+            .SUBSCRIPTION_PURCHASE_VALIDATION_RESULT_LISTENER_ON_RESPONSE:
+        _handleSubscriptionPurchaseValidationResultListenerOnResponse(callMap);
+        break;
+      case AppsflyerConstants
+            .SUBSCRIPTION_PURCHASE_VALIDATION_RESULT_LISTENER_ON_FAILURE:
+        _handleSubscriptionPurchaseValidationResultListenerOnFailure(callMap);
+        break;
+      case AppsflyerConstants.IN_APP_VALIDATION_RESULT_LISTENER_ON_RESPONSE:
+        _handleInAppValidationResultListenerOnResponse(callMap);
+        break;
+      case AppsflyerConstants.IN_APP_VALIDATION_RESULT_LISTENER_ON_FAILURE:
+        _handleInAppValidationResultListenerOnFailure(callMap);
+        break;
+      case AppsflyerConstants.DID_RECEIVE_PURCHASE_REVENUE_VALIDATION_INFO:
+        _handleDidReceivePurchaseRevenueValidationInfo(callMap);
+        break;
+      default:
+        throw ArgumentError("Method not found.");
+    }
+  }
+
+  /// Handles response for the subscription purchase validation result listener.
+  ///
+  /// [callbackData] is the callback data expected in the form of a map.
+  void _handleSubscriptionPurchaseValidationResultListenerOnResponse(
+      dynamic callbackData) {
+    _handleValidationResultListenerOnResponse<SubscriptionValidationResult>(
+      {"result": callbackData},
+      _arsOnResponse,
+      (value) => SubscriptionValidationResultMap.fromJson(value).result,
+    );
+  }
+
+  /// Handles response for the in-app validation result listener.
+  ///
+  /// [callbackData] is the callback data expected in the form of a map.
+  void _handleInAppValidationResultListenerOnResponse(
+      dynamic callbackData) {
+    _handleValidationResultListenerOnResponse<InAppPurchaseValidationResult>(
+      {"result": callbackData},
+      _viapOnResponse,
+      (value) => InAppPurchaseValidationResultMap.fromJson(value).result,
+    );
+  }
+
+  /// Handles failure for the subscription purchase validation result listener.
+  ///
+  /// [callbackData] is the callback data expected in the form of a map.
+  void _handleSubscriptionPurchaseValidationResultListenerOnFailure(
+      Map<String, dynamic> callbackData) {
+    _handleValidationResultListenerOnFailure(callbackData, _arsOnFailure);
+  }
+
+  /// Handles failure for the in-app validation result listener.
+  ///
+  /// [callbackData] is the callback data expected in the form of a map.
+  void _handleInAppValidationResultListenerOnFailure(dynamic callbackData) {
+    _handleValidationResultListenerOnFailure(callbackData, _viapOnFailure);
+  }
+
+  /// Handles the reception of purchase revenue validation info.
+  ///
+  /// [callbackData] is the callback data expected in the form of a map.
+  void _handleDidReceivePurchaseRevenueValidationInfo(dynamic callbackData) {
+    var validationInfo = callbackData[AppsflyerConstants.VALIDATION_INFO]
+        as Map<String, dynamic>?;
+    var errorMap =
+        callbackData[AppsflyerConstants.ERROR] as Map<String, dynamic>?;
+    var error = errorMap != null ? IosError.fromJson(errorMap) : null;
+    if (_didReceivePurchaseRevenueValidationInfo != null) {
+      _didReceivePurchaseRevenueValidationInfo!(validationInfo, error);
+    }
+  }
+
+  /// Handles the response for a validation result listener.
+  ///
+  /// [callbackData] is the callback data expected in the form of a map.
+  /// [onResponse] is a function to be called upon response.
+  /// [converter] is a function used for converting `[callbackData]` to result type `T`
+  void _handleValidationResultListenerOnResponse<T>(dynamic callbackData,
+      OnResponse<T>? onResponse, Map<String, T>? Function(dynamic) converter) {
+    Map<String, T>? res = converter(callbackData);
+    if (onResponse != null) {
+      onResponse(res);
+    } else {
+    }
+  }
+
+  /// Handles failure for a validation result listener.
+  ///
+  /// [callbackData] is the callback data expected in the form of a map.
+  /// [onFailureCallback] is a function to be called on failure.
+  void _handleValidationResultListenerOnFailure(
+      dynamic callbackData, OnFailure? onFailureCallback) {
+    var resultMsg = callbackData[AppsflyerConstants.RESULT] as String;
+    var errorMap =
+        callbackData[AppsflyerConstants.ERROR] as Map<String, dynamic>?;
+    var error = errorMap != null ? JVMThrowable.fromJson(errorMap) : null;
+    if (onFailureCallback != null) {
+      onFailureCallback(resultMsg, error);
+    }
+  }
+}
diff --git a/lib/src/purchase_connector/purchase_connector_configuration.dart b/lib/src/purchase_connector/purchase_connector_configuration.dart
new file mode 100644
index 0000000..3832dc7
--- /dev/null
+++ b/lib/src/purchase_connector/purchase_connector_configuration.dart
@@ -0,0 +1,16 @@
+part of appsflyer_sdk;
+
+/// Contains the configuration settings for a `PurchaseConnector`.
+///
+/// This class controls automatic logging of In-App purchase and subscription events.
+/// It also allows setting a sandbox environment for validation.
+class PurchaseConnectorConfiguration {
+  bool logSubscriptions;
+  bool logInApps;
+  bool sandbox;
+
+  PurchaseConnectorConfiguration(
+      {this.logSubscriptions = false,
+        this.logInApps = false,
+        this.sandbox = false});
+}

From 59877adb132a85f6df26151b8856fc35527866ec Mon Sep 17 00:00:00 2001
From: Dani-Koza-AF <dani.ko@appsflyer.com>
Date: Thu, 24 Jul 2025 15:48:04 +0300
Subject: [PATCH 4/7] Complete Purchase Connector integration with code
 generation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add missing Purchase Connector constants and AFMediationNetwork enum
- Update pubspec.yaml with required dependencies (json_annotation, build_runner, json_serializable)
- Generate JSON serialization code for all Purchase Connector models
- Fix all compilation errors and undefined references
- All 39 tests passing ✅
- Purchase Connector fully functional with type-safe models

Generated files:
- lib/appsflyer_sdk.g.dart - JSON serialization support
- All Purchase Connector model serialization methods

Dependencies added:
- json_annotation: ^4.9.0 (already present)
- build_runner: ^2.3.0
- json_serializable: ^6.5.4
---
 lib/appsflyer_sdk.g.dart         | 461 +++++++++++++++++++++++++++++++
 lib/src/appsflyer_constants.dart |  80 ++++++
 pubspec.yaml                     |   5 +-
 3 files changed, 545 insertions(+), 1 deletion(-)
 create mode 100644 lib/appsflyer_sdk.g.dart

diff --git a/lib/appsflyer_sdk.g.dart b/lib/appsflyer_sdk.g.dart
new file mode 100644
index 0000000..6527510
--- /dev/null
+++ b/lib/appsflyer_sdk.g.dart
@@ -0,0 +1,461 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'appsflyer_sdk.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SubscriptionPurchase _$SubscriptionPurchaseFromJson(
+        Map<String, dynamic> json) =>
+    SubscriptionPurchase(
+      json['acknowledgementState'] as String,
+      json['canceledStateContext'] == null
+          ? null
+          : CanceledStateContext.fromJson(
+              json['canceledStateContext'] as Map<String, dynamic>),
+      json['externalAccountIdentifiers'] == null
+          ? null
+          : ExternalAccountIdentifiers.fromJson(
+              json['externalAccountIdentifiers'] as Map<String, dynamic>),
+      json['kind'] as String,
+      json['latestOrderId'] as String,
+      (json['lineItems'] as List<dynamic>)
+          .map((e) =>
+              SubscriptionPurchaseLineItem.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      json['linkedPurchaseToken'] as String?,
+      json['pausedStateContext'] == null
+          ? null
+          : PausedStateContext.fromJson(
+              json['pausedStateContext'] as Map<String, dynamic>),
+      json['regionCode'] as String,
+      json['startTime'] as String,
+      json['subscribeWithGoogleInfo'] == null
+          ? null
+          : SubscribeWithGoogleInfo.fromJson(
+              json['subscribeWithGoogleInfo'] as Map<String, dynamic>),
+      json['subscriptionState'] as String,
+      json['testPurchase'] == null
+          ? null
+          : TestPurchase.fromJson(json['testPurchase'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$SubscriptionPurchaseToJson(
+        SubscriptionPurchase instance) =>
+    <String, dynamic>{
+      'acknowledgementState': instance.acknowledgementState,
+      'canceledStateContext': instance.canceledStateContext,
+      'externalAccountIdentifiers': instance.externalAccountIdentifiers,
+      'kind': instance.kind,
+      'latestOrderId': instance.latestOrderId,
+      'lineItems': instance.lineItems,
+      'linkedPurchaseToken': instance.linkedPurchaseToken,
+      'pausedStateContext': instance.pausedStateContext,
+      'regionCode': instance.regionCode,
+      'startTime': instance.startTime,
+      'subscribeWithGoogleInfo': instance.subscribeWithGoogleInfo,
+      'subscriptionState': instance.subscriptionState,
+      'testPurchase': instance.testPurchase,
+    };
+
+CanceledStateContext _$CanceledStateContextFromJson(
+        Map<String, dynamic> json) =>
+    CanceledStateContext(
+      json['developerInitiatedCancellation'] == null
+          ? null
+          : DeveloperInitiatedCancellation.fromJson(
+              json['developerInitiatedCancellation'] as Map<String, dynamic>),
+      json['replacementCancellation'] == null
+          ? null
+          : ReplacementCancellation.fromJson(
+              json['replacementCancellation'] as Map<String, dynamic>),
+      json['systemInitiatedCancellation'] == null
+          ? null
+          : SystemInitiatedCancellation.fromJson(
+              json['systemInitiatedCancellation'] as Map<String, dynamic>),
+      json['userInitiatedCancellation'] == null
+          ? null
+          : UserInitiatedCancellation.fromJson(
+              json['userInitiatedCancellation'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$CanceledStateContextToJson(
+        CanceledStateContext instance) =>
+    <String, dynamic>{
+      'developerInitiatedCancellation': instance.developerInitiatedCancellation,
+      'replacementCancellation': instance.replacementCancellation,
+      'systemInitiatedCancellation': instance.systemInitiatedCancellation,
+      'userInitiatedCancellation': instance.userInitiatedCancellation,
+    };
+
+DeveloperInitiatedCancellation _$DeveloperInitiatedCancellationFromJson(
+        Map<String, dynamic> json) =>
+    DeveloperInitiatedCancellation();
+
+Map<String, dynamic> _$DeveloperInitiatedCancellationToJson(
+        DeveloperInitiatedCancellation instance) =>
+    <String, dynamic>{};
+
+ReplacementCancellation _$ReplacementCancellationFromJson(
+        Map<String, dynamic> json) =>
+    ReplacementCancellation();
+
+Map<String, dynamic> _$ReplacementCancellationToJson(
+        ReplacementCancellation instance) =>
+    <String, dynamic>{};
+
+SystemInitiatedCancellation _$SystemInitiatedCancellationFromJson(
+        Map<String, dynamic> json) =>
+    SystemInitiatedCancellation();
+
+Map<String, dynamic> _$SystemInitiatedCancellationToJson(
+        SystemInitiatedCancellation instance) =>
+    <String, dynamic>{};
+
+UserInitiatedCancellation _$UserInitiatedCancellationFromJson(
+        Map<String, dynamic> json) =>
+    UserInitiatedCancellation(
+      json['cancelSurveyResult'] == null
+          ? null
+          : CancelSurveyResult.fromJson(
+              json['cancelSurveyResult'] as Map<String, dynamic>),
+      json['cancelTime'] as String,
+    );
+
+Map<String, dynamic> _$UserInitiatedCancellationToJson(
+        UserInitiatedCancellation instance) =>
+    <String, dynamic>{
+      'cancelSurveyResult': instance.cancelSurveyResult,
+      'cancelTime': instance.cancelTime,
+    };
+
+CancelSurveyResult _$CancelSurveyResultFromJson(Map<String, dynamic> json) =>
+    CancelSurveyResult(
+      json['reason'] as String,
+      json['reasonUserInput'] as String,
+    );
+
+Map<String, dynamic> _$CancelSurveyResultToJson(CancelSurveyResult instance) =>
+    <String, dynamic>{
+      'reason': instance.reason,
+      'reasonUserInput': instance.reasonUserInput,
+    };
+
+ExternalAccountIdentifiers _$ExternalAccountIdentifiersFromJson(
+        Map<String, dynamic> json) =>
+    ExternalAccountIdentifiers(
+      json['externalAccountId'] as String,
+      json['obfuscatedExternalAccountId'] as String,
+      json['obfuscatedExternalProfileId'] as String,
+    );
+
+Map<String, dynamic> _$ExternalAccountIdentifiersToJson(
+        ExternalAccountIdentifiers instance) =>
+    <String, dynamic>{
+      'externalAccountId': instance.externalAccountId,
+      'obfuscatedExternalAccountId': instance.obfuscatedExternalAccountId,
+      'obfuscatedExternalProfileId': instance.obfuscatedExternalProfileId,
+    };
+
+SubscriptionPurchaseLineItem _$SubscriptionPurchaseLineItemFromJson(
+        Map<String, dynamic> json) =>
+    SubscriptionPurchaseLineItem(
+      json['autoRenewingPlan'] == null
+          ? null
+          : AutoRenewingPlan.fromJson(
+              json['autoRenewingPlan'] as Map<String, dynamic>),
+      json['deferredItemReplacement'] == null
+          ? null
+          : DeferredItemReplacement.fromJson(
+              json['deferredItemReplacement'] as Map<String, dynamic>),
+      json['expiryTime'] as String,
+      json['offerDetails'] == null
+          ? null
+          : OfferDetails.fromJson(json['offerDetails'] as Map<String, dynamic>),
+      json['prepaidPlan'] == null
+          ? null
+          : PrepaidPlan.fromJson(json['prepaidPlan'] as Map<String, dynamic>),
+      json['productId'] as String,
+    );
+
+Map<String, dynamic> _$SubscriptionPurchaseLineItemToJson(
+        SubscriptionPurchaseLineItem instance) =>
+    <String, dynamic>{
+      'autoRenewingPlan': instance.autoRenewingPlan,
+      'deferredItemReplacement': instance.deferredItemReplacement,
+      'expiryTime': instance.expiryTime,
+      'offerDetails': instance.offerDetails,
+      'prepaidPlan': instance.prepaidPlan,
+      'productId': instance.productId,
+    };
+
+OfferDetails _$OfferDetailsFromJson(Map<String, dynamic> json) => OfferDetails(
+      (json['offerTags'] as List<dynamic>?)?.map((e) => e as String).toList(),
+      json['basePlanId'] as String,
+      json['offerId'] as String?,
+    );
+
+Map<String, dynamic> _$OfferDetailsToJson(OfferDetails instance) =>
+    <String, dynamic>{
+      'offerTags': instance.offerTags,
+      'basePlanId': instance.basePlanId,
+      'offerId': instance.offerId,
+    };
+
+AutoRenewingPlan _$AutoRenewingPlanFromJson(Map<String, dynamic> json) =>
+    AutoRenewingPlan(
+      json['autoRenewEnabled'] as bool?,
+      json['priceChangeDetails'] == null
+          ? null
+          : SubscriptionItemPriceChangeDetails.fromJson(
+              json['priceChangeDetails'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$AutoRenewingPlanToJson(AutoRenewingPlan instance) =>
+    <String, dynamic>{
+      'autoRenewEnabled': instance.autoRenewEnabled,
+      'priceChangeDetails': instance.priceChangeDetails,
+    };
+
+SubscriptionItemPriceChangeDetails _$SubscriptionItemPriceChangeDetailsFromJson(
+        Map<String, dynamic> json) =>
+    SubscriptionItemPriceChangeDetails(
+      json['expectedNewPriceChargeTime'] as String,
+      json['newPrice'] == null
+          ? null
+          : Money.fromJson(json['newPrice'] as Map<String, dynamic>),
+      json['priceChangeMode'] as String,
+      json['priceChangeState'] as String,
+    );
+
+Map<String, dynamic> _$SubscriptionItemPriceChangeDetailsToJson(
+        SubscriptionItemPriceChangeDetails instance) =>
+    <String, dynamic>{
+      'expectedNewPriceChargeTime': instance.expectedNewPriceChargeTime,
+      'newPrice': instance.newPrice,
+      'priceChangeMode': instance.priceChangeMode,
+      'priceChangeState': instance.priceChangeState,
+    };
+
+Money _$MoneyFromJson(Map<String, dynamic> json) => Money(
+      json['currencyCode'] as String,
+      (json['nanos'] as num).toInt(),
+      (json['units'] as num).toInt(),
+    );
+
+Map<String, dynamic> _$MoneyToJson(Money instance) => <String, dynamic>{
+      'currencyCode': instance.currencyCode,
+      'nanos': instance.nanos,
+      'units': instance.units,
+    };
+
+DeferredItemReplacement _$DeferredItemReplacementFromJson(
+        Map<String, dynamic> json) =>
+    DeferredItemReplacement(
+      json['productId'] as String,
+    );
+
+Map<String, dynamic> _$DeferredItemReplacementToJson(
+        DeferredItemReplacement instance) =>
+    <String, dynamic>{
+      'productId': instance.productId,
+    };
+
+PrepaidPlan _$PrepaidPlanFromJson(Map<String, dynamic> json) => PrepaidPlan(
+      json['allowExtendAfterTime'] as String?,
+    );
+
+Map<String, dynamic> _$PrepaidPlanToJson(PrepaidPlan instance) =>
+    <String, dynamic>{
+      'allowExtendAfterTime': instance.allowExtendAfterTime,
+    };
+
+PausedStateContext _$PausedStateContextFromJson(Map<String, dynamic> json) =>
+    PausedStateContext(
+      json['autoResumeTime'] as String,
+    );
+
+Map<String, dynamic> _$PausedStateContextToJson(PausedStateContext instance) =>
+    <String, dynamic>{
+      'autoResumeTime': instance.autoResumeTime,
+    };
+
+SubscribeWithGoogleInfo _$SubscribeWithGoogleInfoFromJson(
+        Map<String, dynamic> json) =>
+    SubscribeWithGoogleInfo(
+      json['emailAddress'] as String,
+      json['familyName'] as String,
+      json['givenName'] as String,
+      json['profileId'] as String,
+      json['profileName'] as String,
+    );
+
+Map<String, dynamic> _$SubscribeWithGoogleInfoToJson(
+        SubscribeWithGoogleInfo instance) =>
+    <String, dynamic>{
+      'emailAddress': instance.emailAddress,
+      'familyName': instance.familyName,
+      'givenName': instance.givenName,
+      'profileId': instance.profileId,
+      'profileName': instance.profileName,
+    };
+
+TestPurchase _$TestPurchaseFromJson(Map<String, dynamic> json) =>
+    TestPurchase();
+
+Map<String, dynamic> _$TestPurchaseToJson(TestPurchase instance) =>
+    <String, dynamic>{};
+
+InAppPurchaseValidationResult _$InAppPurchaseValidationResultFromJson(
+        Map<String, dynamic> json) =>
+    InAppPurchaseValidationResult(
+      json['success'] as bool,
+      json['productPurchase'] == null
+          ? null
+          : ProductPurchase.fromJson(
+              json['productPurchase'] as Map<String, dynamic>),
+      json['failureData'] == null
+          ? null
+          : ValidationFailureData.fromJson(
+              json['failureData'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$InAppPurchaseValidationResultToJson(
+        InAppPurchaseValidationResult instance) =>
+    <String, dynamic>{
+      'success': instance.success,
+      'productPurchase': instance.productPurchase,
+      'failureData': instance.failureData,
+    };
+
+InAppPurchaseValidationResultMap _$InAppPurchaseValidationResultMapFromJson(
+        Map<String, dynamic> json) =>
+    InAppPurchaseValidationResultMap(
+      (json['result'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k,
+            InAppPurchaseValidationResult.fromJson(e as Map<String, dynamic>)),
+      ),
+    );
+
+Map<String, dynamic> _$InAppPurchaseValidationResultMapToJson(
+        InAppPurchaseValidationResultMap instance) =>
+    <String, dynamic>{
+      'result': instance.result,
+    };
+
+ProductPurchase _$ProductPurchaseFromJson(Map<String, dynamic> json) =>
+    ProductPurchase(
+      json['kind'] as String,
+      json['purchaseTimeMillis'] as String,
+      (json['purchaseState'] as num).toInt(),
+      (json['consumptionState'] as num).toInt(),
+      json['developerPayload'] as String,
+      json['orderId'] as String,
+      (json['purchaseType'] as num).toInt(),
+      (json['acknowledgementState'] as num).toInt(),
+      json['purchaseToken'] as String,
+      json['productId'] as String,
+      (json['quantity'] as num).toInt(),
+      json['obfuscatedExternalAccountId'] as String,
+      json['obfuscatedExternalProfileId'] as String,
+      json['regionCode'] as String,
+    );
+
+Map<String, dynamic> _$ProductPurchaseToJson(ProductPurchase instance) =>
+    <String, dynamic>{
+      'kind': instance.kind,
+      'purchaseTimeMillis': instance.purchaseTimeMillis,
+      'purchaseState': instance.purchaseState,
+      'consumptionState': instance.consumptionState,
+      'developerPayload': instance.developerPayload,
+      'orderId': instance.orderId,
+      'purchaseType': instance.purchaseType,
+      'acknowledgementState': instance.acknowledgementState,
+      'purchaseToken': instance.purchaseToken,
+      'productId': instance.productId,
+      'quantity': instance.quantity,
+      'obfuscatedExternalAccountId': instance.obfuscatedExternalAccountId,
+      'obfuscatedExternalProfileId': instance.obfuscatedExternalProfileId,
+      'regionCode': instance.regionCode,
+    };
+
+SubscriptionValidationResult _$SubscriptionValidationResultFromJson(
+        Map<String, dynamic> json) =>
+    SubscriptionValidationResult(
+      json['success'] as bool,
+      json['subscriptionPurchase'] == null
+          ? null
+          : SubscriptionPurchase.fromJson(
+              json['subscriptionPurchase'] as Map<String, dynamic>),
+      json['failureData'] == null
+          ? null
+          : ValidationFailureData.fromJson(
+              json['failureData'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$SubscriptionValidationResultToJson(
+        SubscriptionValidationResult instance) =>
+    <String, dynamic>{
+      'success': instance.success,
+      'subscriptionPurchase': instance.subscriptionPurchase,
+      'failureData': instance.failureData,
+    };
+
+SubscriptionValidationResultMap _$SubscriptionValidationResultMapFromJson(
+        Map<String, dynamic> json) =>
+    SubscriptionValidationResultMap(
+      (json['result'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k,
+            SubscriptionValidationResult.fromJson(e as Map<String, dynamic>)),
+      ),
+    );
+
+Map<String, dynamic> _$SubscriptionValidationResultMapToJson(
+        SubscriptionValidationResultMap instance) =>
+    <String, dynamic>{
+      'result': instance.result,
+    };
+
+ValidationFailureData _$ValidationFailureDataFromJson(
+        Map<String, dynamic> json) =>
+    ValidationFailureData(
+      (json['status'] as num).toInt(),
+      json['description'] as String,
+    );
+
+Map<String, dynamic> _$ValidationFailureDataToJson(
+        ValidationFailureData instance) =>
+    <String, dynamic>{
+      'status': instance.status,
+      'description': instance.description,
+    };
+
+JVMThrowable _$JVMThrowableFromJson(Map<String, dynamic> json) => JVMThrowable(
+      json['type'] as String,
+      json['message'] as String,
+      json['stacktrace'] as String,
+      json['cause'] == null
+          ? null
+          : JVMThrowable.fromJson(json['cause'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$JVMThrowableToJson(JVMThrowable instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'message': instance.message,
+      'stacktrace': instance.stacktrace,
+      'cause': instance.cause,
+    };
+
+IosError _$IosErrorFromJson(Map<String, dynamic> json) => IosError(
+      json['localizedDescription'] as String,
+      json['domain'] as String,
+      (json['code'] as num).toInt(),
+    );
+
+Map<String, dynamic> _$IosErrorToJson(IosError instance) => <String, dynamic>{
+      'localizedDescription': instance.localizedDescription,
+      'domain': instance.domain,
+      'code': instance.code,
+    };
diff --git a/lib/src/appsflyer_constants.dart b/lib/src/appsflyer_constants.dart
index 2f7b141..e01f006 100644
--- a/lib/src/appsflyer_constants.dart
+++ b/lib/src/appsflyer_constants.dart
@@ -27,4 +27,84 @@ class AppsflyerConstants {
   static const String DISABLE_COLLECT_ASA = "disableCollectASA";
   static const String DISABLE_ADVERTISING_IDENTIFIER =
       "disableAdvertisingIdentifier";
+
+  // Purchase Connector constants
+  static const String AF_PURCHASE_CONNECTOR_CHANNEL = "af-purchase-connector";
+  static const String CONFIGURE_KEY = "configure";
+  static const String LOG_SUBS_KEY = "logSubscriptionPurchase";
+  static const String LOG_IN_APP_KEY = "logInAppPurchase";
+  static const String SANDBOX_KEY = "sandbox";
+  static const String VALIDATION_INFO = "validation_info";
+  static const String ERROR = "error";
+  static const String RESULT = "result";
+
+  // Purchase Connector listeners
+  static const String
+      SUBSCRIPTION_PURCHASE_VALIDATION_RESULT_LISTENER_ON_RESPONSE =
+      "SubscriptionPurchaseValidationResultListener#onResponse";
+  static const String
+      SUBSCRIPTION_PURCHASE_VALIDATION_RESULT_LISTENER_ON_FAILURE =
+      "SubscriptionPurchaseValidationResultListener#onFailure";
+  static const String IN_APP_VALIDATION_RESULT_LISTENER_ON_RESPONSE =
+      "InAppValidationResultListener#onResponse";
+  static const String IN_APP_VALIDATION_RESULT_LISTENER_ON_FAILURE =
+      "InAppValidationResultListener#onFailure";
+  static const String DID_RECEIVE_PURCHASE_REVENUE_VALIDATION_INFO =
+      "DidReceivePurchaseRevenueValidationInfo";
+
+  // Purchase Connector error messages
+  static const String MISSING_CONFIGURATION_EXCEPTION_MSG =
+      "Configuration is missing. Call PurchaseConnector.configure() first.";
+  static const String RE_CONFIGURE_ERROR_MSG =
+      "PurchaseConnector already configured.";
+}
+
+enum AFMediationNetwork {
+  ironSource,
+  applovinMax,
+  googleAdMob,
+  fyber,
+  appodeal,
+  admost,
+  topon,
+  tradplus,
+  yandex,
+  chartboost,
+  unity,
+  toponPte,
+  customMediation,
+  directMonetizationNetwork;
+
+  String get value {
+    switch (this) {
+      case AFMediationNetwork.ironSource:
+        return "ironsource";
+      case AFMediationNetwork.applovinMax:
+        return "applovin_max";
+      case AFMediationNetwork.googleAdMob:
+        return "google_admob";
+      case AFMediationNetwork.fyber:
+        return "fyber";
+      case AFMediationNetwork.appodeal:
+        return "appodeal";
+      case AFMediationNetwork.admost:
+        return "admost";
+      case AFMediationNetwork.topon:
+        return "topon";
+      case AFMediationNetwork.tradplus:
+        return "tradplus";
+      case AFMediationNetwork.yandex:
+        return "yandex";
+      case AFMediationNetwork.chartboost:
+        return "chartboost";
+      case AFMediationNetwork.unity:
+        return "unity";
+      case AFMediationNetwork.toponPte:
+        return "topon_pte";
+      case AFMediationNetwork.customMediation:
+        return "custom_mediation";
+      case AFMediationNetwork.directMonetizationNetwork:
+        return "direct_monetization_network";
+    }
+  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 2c67b59..a060eba 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: appsflyer_sdk
 description: A Flutter plugin for AppsFlyer SDK. Supports iOS and Android.
-version: 6.16.21
+version: 6.15.2
 
 homepage: https://github.com/AppsFlyerSDK/flutter_appsflyer_sdk
 
@@ -11,6 +11,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  json_annotation: ^4.9.0
 
 dev_dependencies:
   flutter_test:
@@ -18,6 +19,8 @@ dev_dependencies:
   test: ^1.16.5
   mockito: ^5.4.4
   effective_dart: ^1.3.0
+  build_runner: ^2.3.0
+  json_serializable: ^6.5.4
 
 
 flutter:

From a9a0c803c957a6f58daa888437063532519afb8a Mon Sep 17 00:00:00 2001
From: Dani-Koza-AF <dani.ko@appsflyer.com>
Date: Thu, 24 Jul 2025 16:02:57 +0300
Subject: [PATCH 5/7] setting the proper SDK versions

---
 android/build.gradle      |  6 +++---
 ios/appsflyer_sdk.podspec | 10 +++++-----
 pubspec.yaml              |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 84a1590..fe9a0b6 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,7 +21,7 @@ def includeConnector = project.findProperty('appsflyer.enable_purchase_connector
 android {
     defaultConfig {
         minSdkVersion 19
-        compileSdk 33
+        compileSdk 34
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true
@@ -46,10 +46,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'com.appsflyer:af-android-sdk:6.15.2'
+    implementation 'com.appsflyer:af-android-sdk:6.17.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
 //    implementation 'androidx.core:core-ktx:1.13.1'
     if (includeConnector) {
-        implementation 'com.appsflyer:purchase-connector:2.1.0'
+        implementation 'com.appsflyer:purchase-connector:2.1.1'
     }
 }
\ No newline at end of file
diff --git a/ios/appsflyer_sdk.podspec b/ios/appsflyer_sdk.podspec
index c48c2b8..00912f5 100644
--- a/ios/appsflyer_sdk.podspec
+++ b/ios/appsflyer_sdk.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'appsflyer_sdk'
-  s.version          = '6.15.3'
+  s.version          = '6.17.1'
   s.summary          = 'AppsFlyer Integration for Flutter'
   s.description      = 'AppsFlyer is the market leader in mobile advertising attribution & analytics, helping marketers to pinpoint their targeting, optimize their ad spend and boost their ROI.'
   s.homepage         = 'https://github.com/AppsFlyerSDK/flutter_appsflyer_sdk'
@@ -12,21 +12,21 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.static_framework = true
   if defined?($AppsFlyerPurchaseConnector)
-    s.default_subspecs = 'Core', 'PurchaseConnector' # add this line
+    s.default_subspecs = 'Core', 'PurchaseConnector' 
   else
-    s.default_subspecs = 'Core' # add this line
+    s.default_subspecs = 'Core' 
   end
 
   s.subspec 'Core' do |ss|
     ss.source_files = 'Classes/**/*'
     ss.public_header_files = 'Classes/**/*.h'
     ss.dependency 'Flutter'
-    ss.ios.dependency 'AppsFlyerFramework','6.15.3'
+    ss.ios.dependency 'AppsFlyerFramework','6.17.1'
   end
 
   s.subspec 'PurchaseConnector' do |ss|
     ss.dependency 'Flutter'
-    ss.ios.dependency 'PurchaseConnector', '6.15.3'
+    ss.ios.dependency 'PurchaseConnector', '6.17.1'
     ss.source_files = 'PurchaseConnector/**/*'
     ss.public_header_files = 'PurchaseConnector/**/*.h'
   
diff --git a/pubspec.yaml b/pubspec.yaml
index a060eba..1aaa948 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: appsflyer_sdk
 description: A Flutter plugin for AppsFlyer SDK. Supports iOS and Android.
-version: 6.15.2
+version: 6.17.1
 
 homepage: https://github.com/AppsFlyerSDK/flutter_appsflyer_sdk
 

From 0c5fb300d1e5cd3cfd2109dd75d8fcbe5d63d751 Mon Sep 17 00:00:00 2001
From: Dani-Koza-AF <dani.ko@appsflyer.com>
Date: Thu, 24 Jul 2025 16:13:11 +0300
Subject: [PATCH 6/7] documentation small fix

---
 doc/PurchaseConnector.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/PurchaseConnector.md b/doc/PurchaseConnector.md
index b6cde59..e076ebe 100644
--- a/doc/PurchaseConnector.md
+++ b/doc/PurchaseConnector.md
@@ -43,8 +43,8 @@ support@appsflyer.com
 
 The Purchase Connector feature of the AppsFlyer SDK depends on specific libraries provided by Google and Apple for managing in-app purchases:
 
--   For Android, it depends on the  [Google Play Billing Library](https://developer.android.com/google/play/billing/integrate) (Supported versions: 5.x.x - 6.x.x).
--   For iOS, it depends on  [StoreKit](https://developer.apple.com/documentation/storekit). (Supported version is StoreKit V1)
+-   For Android, it depends on the  [Google Play Billing Library](https://developer.android.com/google/play/billing/integrate) (Supported versions: 5.x.x - 7.x.x).
+-   For iOS, it depends on  [StoreKit](https://developer.apple.com/documentation/storekit). (Supported versions are StoreKit V1 + V2)
 
 However, these dependencies aren't actively included with the SDK. This means that the responsibility of managing these dependencies and including the necessary libraries in your project falls on you as the consumer of the SDK.
 

From 33c68f812568b0fc12d13fcd72d21994609e69bc Mon Sep 17 00:00:00 2001
From: Dani-Koza-AF <dani.ko@appsflyer.com>
Date: Sun, 27 Jul 2025 14:10:14 +0300
Subject: [PATCH 7/7] restore and solve code conflicts and ghost code

Aligned with development
---
 android/build.gradle                          |  9 +++-
 .../appsflyersdk/AppsflyerSdkPlugin.java      | 53 ++++++++++++++++---
 lib/src/appsflyer_constants.dart              |  2 +-
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index fe9a0b6..fb0b2b2 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,11 +21,12 @@ def includeConnector = project.findProperty('appsflyer.enable_purchase_connector
 android {
     defaultConfig {
         minSdkVersion 19
-        compileSdk 34
+        compileSdk 35
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true
     }
+    
     lintOptions {
         disable 'InvalidPackage'
     }
@@ -38,6 +39,12 @@ android {
         }
         includeConnector ? ['src/main/include-connector'] : ['src/main/exlude-connector']
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    
     kotlinOptions {
         jvmTarget = '17'
     }
diff --git a/android/src/main/java/com/appsflyer/appsflyersdk/AppsflyerSdkPlugin.java b/android/src/main/java/com/appsflyer/appsflyersdk/AppsflyerSdkPlugin.java
index ed34267..a5245f7 100644
--- a/android/src/main/java/com/appsflyer/appsflyersdk/AppsflyerSdkPlugin.java
+++ b/android/src/main/java/com/appsflyer/appsflyersdk/AppsflyerSdkPlugin.java
@@ -34,6 +34,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
@@ -52,6 +53,8 @@
 import static com.appsflyer.appsflyersdk.AppsFlyerConstants.AF_PLUGIN_TAG;
 import static com.appsflyer.appsflyersdk.AppsFlyerConstants.AF_SUCCESS;
 
+import androidx.annotation.NonNull;
+
 /**
  * AppsflyerSdkPlugin
  */
@@ -72,7 +75,6 @@ public class AppsflyerSdkPlugin implements MethodCallHandler, FlutterPlugin, Act
     //private FlutterView mFlutterView;
     private Context mContext;
     private Application mApplication;
-    private Intent mIntent;
     private MethodChannel mMethodChannel;
     private MethodChannel mCallbackChannel;
     private Activity activity;
@@ -175,7 +177,6 @@ private void onAttachedToEngine(Context applicationContext, BinaryMessenger mess
         mMethodChannel.setMethodCallHandler(this);
         mCallbackChannel = new MethodChannel(messenger, AppsFlyerConstants.AF_CALLBACK_CHANNEL);
         mCallbackChannel.setMethodCallHandler(callbacksHandler);
-
     }
 
 
@@ -205,6 +206,7 @@ private void startListening(Object arguments, Result rawResult) {
     public void onMethodCall(MethodCall call, Result result) {
         if (activity == null) {
             Log.d(AF_PLUGIN_TAG, LogMessages.ACTIVITY_NOT_ATTACHED_TO_ENGINE);
+            result.error("NO_ACTIVITY", "The current activity is null", null);
             return;
         }
         final String method = call.method;
@@ -233,6 +235,9 @@ public void onMethodCall(MethodCall call, Result result) {
             case "setConsentData":
                 setConsentData(call, result);
                 break;
+            case "setConsentDataV2":
+                setConsentDataV2(call, result);
+                break;        
             case "setIsUpdate":
                 setIsUpdate(call, result);
                 break;
@@ -424,6 +429,11 @@ private void startSDK(MethodCall call, final Result result) {
         result.success(null);
     }
 
+    /**
+     * Sets the user consent data for tracking.
+     * @deprecated Use {@link #setConsentDataV2(MethodCall, Result)} instead!
+     */
+    @Deprecated
     public void setConsentData(MethodCall call, Result result) {
         Map<String, Object> arguments = (Map<String, Object>) call.arguments;
         Map<String, Object> consentDict = (Map<String, Object>) arguments.get("consentData");
@@ -445,6 +455,35 @@ public void setConsentData(MethodCall call, Result result) {
         result.success(null);
     }
 
+    /**
+     * Sets the user consent data for tracking with flexible parameters.
+     */
+    public void setConsentDataV2(MethodCall call, Result result) {
+        try {
+            AppsFlyerConsent consent = getAppsFlyerConsentFromCall(call);
+            AppsFlyerLib.getInstance().setConsentData(consent);
+            result.success(null);
+        } catch (Exception e) {
+            Log.e(AF_PLUGIN_TAG, LogMessages.ERROR_WHILE_SETTING_CONSENT + e.getMessage(), e);
+            result.error("CONSENT_ERROR", LogMessages.ERROR_WHILE_SETTING_CONSENT + e.getMessage(), null);
+        }
+    }
+
+    @NonNull
+    @SuppressWarnings("unchecked")
+    private AppsFlyerConsent getAppsFlyerConsentFromCall(MethodCall call) {
+        Map<String, Object> args = (Map<String, Object>) call.arguments;
+
+        // Extract nullable Boolean arguments
+        Boolean isUserSubjectToGDPR = (Boolean) args.get("isUserSubjectToGDPR");
+        Boolean consentForDataUsage = (Boolean) args.get("consentForDataUsage");
+        Boolean consentForAdsPersonalization = (Boolean) args.get("consentForAdsPersonalization");
+        Boolean hasConsentForAdStorage = (Boolean) args.get("hasConsentForAdStorage");
+
+        // Create and return AppsFlyerConsent object with the given parameters
+        return new AppsFlyerConsent(isUserSubjectToGDPR, consentForDataUsage, consentForAdsPersonalization, hasConsentForAdStorage);
+    }
+
     private void enableTCFDataCollection(MethodCall call, Result result) {
         boolean shouldCollect = (boolean) call.argument("shouldCollect");
         AppsFlyerLib.getInstance().enableTCFDataCollection(shouldCollect);
@@ -970,7 +1009,7 @@ private void logAdRevenue(MethodCall call, Result result) {
             double revenue = requireNonNullArgument(call, "revenue");
             String mediationNetworkString = requireNonNullArgument(call, "mediationNetwork");
 
-            MediationNetwork mediationNetwork = MediationNetwork.valueOf(mediationNetworkString.toUpperCase());
+            MediationNetwork mediationNetwork = MediationNetwork.valueOf(mediationNetworkString.toUpperCase(Locale.ENGLISH));
 
             // No null check for additionalParameters since it's acceptable for it to be null (optional data)
             Map<String, Object> additionalParameters = call.argument("additionalParameters");
@@ -1077,32 +1116,34 @@ public void onDetachedFromEngine(FlutterPluginBinding binding) {
         mEventChannel.setStreamHandler(null);
         mEventChannel = null;
         AppsFlyerPurchaseConnector.INSTANCE.onDetachedFromEngine(binding);
-
+        mContext = null;
+        mApplication = null;
     }
 
     @Override
     public void onAttachedToActivity(ActivityPluginBinding binding) {
         activity = binding.getActivity();
-        mIntent = binding.getActivity().getIntent();
         mApplication = binding.getActivity().getApplication();
         binding.addOnNewIntentListener(onNewIntentListener);
     }
 
     @Override
     public void onDetachedFromActivityForConfigChanges() {
-
+        this.activity = null;
     }
 
     @Override
     public void onReattachedToActivityForConfigChanges(ActivityPluginBinding binding) {
         sendCachedCallbacksToDart();
         binding.addOnNewIntentListener(onNewIntentListener);
+        activity = binding.getActivity();
     }
 
     @Override
     public void onDetachedFromActivity() {
         activity = null;
         saveCallbacks = true;
+        AppsFlyerLib.getInstance().unregisterConversionListener();
     }
 
 }
diff --git a/lib/src/appsflyer_constants.dart b/lib/src/appsflyer_constants.dart
index e01f006..400298b 100644
--- a/lib/src/appsflyer_constants.dart
+++ b/lib/src/appsflyer_constants.dart
@@ -3,7 +3,7 @@ part of appsflyer_sdk;
 enum EmailCryptType { EmailCryptTypeNone, EmailCryptTypeSHA256 }
 
 class AppsflyerConstants {
-  static const String PLUGIN_VERSION = "6.16.21";
+  static const String PLUGIN_VERSION = "6.17.1";
   static const String AF_DEV_KEY = "afDevKey";
   static const String AF_APP_Id = "afAppId";
   static const String AF_IS_DEBUG = "isDebug";