Merge pull request #442 from qonversion/release/11.6.0

Release 11.6.0

Author: NickSxti

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 11.6.0
+* // Update changelog here
+
 ## 11.5.0
 * // Update changelog here
 

android/build.gradle

@@ -51,6 +51,6 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "io.qonversion:sandwich:7.7.0"
+    implementation "io.qonversion:sandwich:7.8.0"
     implementation 'com.google.code.gson:gson:2.9.0'
 }

android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/QonversionPlugin.kt

@@ -21,6 +21,7 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
     private var activity: Activity? = null
     private var channel: MethodChannel? = null
     private var updatedEntitlementsStreamHandler: BaseEventStreamHandler? = null
+    private var deferredPurchaseStreamHandler: BaseEventStreamHandler? = null
     private var noCodesPlugin: NoCodesPlugin? = null
 
     private val qonversionSandwich by lazy {
@@ -41,12 +42,18 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
             val payload = Gson().toJson(entitlements)
             updatedEntitlementsStreamHandler?.eventSink?.success(payload)
         }
+
+        override fun onDeferredPurchaseCompleted(purchaseResult: BridgeData) {
+            val payload = Gson().toJson(purchaseResult)
+            deferredPurchaseStreamHandler?.eventSink?.success(payload)
+        }
     }
 
     companion object {
         private const val METHOD_CHANNEL = "qonversion_plugin"
         private const val EVENT_CHANNEL_PROMO_PURCHASES = "promo_purchases"
         private const val EVENT_CHANNEL_UPDATED_ENTITLEMENTS = "updated_entitlements"
+        private const val EVENT_CHANNEL_DEFERRED_PURCHASE = "deferred_purchase"
     }
 
     override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
@@ -364,6 +371,11 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
         updatedEntitlementsListener.register()
         this.updatedEntitlementsStreamHandler = updatedEntitlementsListener.eventStreamHandler
 
+        // Register deferred purchase events
+        val deferredPurchaseListener = BaseListenerWrapper(messenger, EVENT_CHANNEL_DEFERRED_PURCHASE)
+        deferredPurchaseListener.register()
+        this.deferredPurchaseStreamHandler = deferredPurchaseListener.eventStreamHandler
+
         // Register promo purchases events. Android SDK does not generate any promo purchases yet
         val promoPurchasesListener = BaseListenerWrapper(messenger, EVENT_CHANNEL_PROMO_PURCHASES)
         promoPurchasesListener.register()
@@ -373,6 +385,7 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
         channel?.setMethodCallHandler(null)
         channel = null
         this.updatedEntitlementsStreamHandler = null
+        this.deferredPurchaseStreamHandler = null
         this.noCodesPlugin = null
         this.application = null
     }

ios/Classes/SwiftQonversionPlugin.swift

@@ -8,6 +8,7 @@ import QonversionSandwich
 
 public class SwiftQonversionPlugin: NSObject, FlutterPlugin {
   var updatedEntitlementsStreamHandler: BaseEventStreamHandler?
+  var deferredPurchaseStreamHandler: BaseEventStreamHandler?
   var promoPurchasesStreamHandler: BaseEventStreamHandler?
   var qonversionSandwich: QonversionSandwich?
   var noCodesPlugin: NoCodesPlugin?
@@ -27,6 +28,10 @@ public class SwiftQonversionPlugin: NSObject, FlutterPlugin {
     let updatedEntitlementsListener = FlutterListenerWrapper<BaseEventStreamHandler>(registrar, postfix: "updated_entitlements")
     updatedEntitlementsListener.register() { instance.updatedEntitlementsStreamHandler = $0 }
 
+    // Register deferred purchase events
+    let deferredPurchaseListener = FlutterListenerWrapper<BaseEventStreamHandler>(registrar, postfix: "deferred_purchase")
+    deferredPurchaseListener.register() { instance.deferredPurchaseStreamHandler = $0 }
+
     // Register promo purchases events
     let promoPurchasesListener = FlutterListenerWrapper<BaseEventStreamHandler>(registrar, postfix: "promo_purchases")
     promoPurchasesListener.register() { instance.promoPurchasesStreamHandler = $0 }
@@ -462,6 +467,15 @@ extension SwiftQonversionPlugin: QonversionEventListener {
     }
   }
 
+  public func qonversionDidCompleteDeferredPurchase(_ purchaseResult: [String : Any]) {
+    guard let jsonData = purchaseResult.toJson() else {
+      return
+    }
+    DispatchQueue.main.async {
+      self.deferredPurchaseStreamHandler?.eventSink?(jsonData)
+    }
+  }
+
   public func shouldPurchasePromoProduct(with productId: String) {
     DispatchQueue.main.async {
       self.promoPurchasesStreamHandler?.eventSink?(productId)

ios/qonversion_flutter.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
   s.platform = :ios, '13.0'
-  s.dependency "QonversionSandwich", "7.7.0"
+  s.dependency "QonversionSandwich", "7.8.0"
 
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }

lib/src/internal/qonversion_internal.dart

@@ -11,13 +11,16 @@ import 'package:qonversion_flutter/src/internal/utils/string.dart';
 import 'constants.dart';
 
 class QonversionInternal implements Qonversion {
-  static const String sdkVersion = "11.5.0";
+  static const String sdkVersion = "11.6.0";
 
   final MethodChannel _channel = MethodChannel('qonversion_plugin');
 
   final _updatedEntitlementsEventChannel =
       EventChannel('qonversion_flutter_updated_entitlements');
 
+  final _deferredPurchaseEventChannel =
+      EventChannel('qonversion_flutter_deferred_purchase');
+
   final _promoPurchasesEventChannel =
       EventChannel('qonversion_flutter_promo_purchases');
 
@@ -55,6 +58,16 @@ class QonversionInternal implements Qonversion {
             .map((key, value) => MapEntry(key, QEntitlement.fromJson(value)));
       });
 
+  @override
+  Stream<QPurchaseResult> get deferredPurchaseStream =>
+      _deferredPurchaseEventChannel
+          .receiveBroadcastStream()
+          .cast<String>()
+          .map((event) {
+        final Map<String, dynamic> decodedEvent = jsonDecode(event);
+        return QPurchaseResult.fromJson(decodedEvent);
+      });
+
   @override
   Stream<String> get promoPurchasesStream =>
       _promoPurchasesEventChannel.receiveBroadcastStream().cast<String>();

lib/src/qonversion.dart

@@ -39,6 +39,11 @@ abstract class Qonversion {
   /// For example, when pending purchases like SCA, Ask to buy, etc., happen.
   Stream<Map<String, QEntitlement>> get updatedEntitlementsStream;
 
+  /// Yields an event each time a deferred purchase completes.
+  /// For example, when pending purchases like SCA, Ask to Buy, etc., are approved.
+  /// Provides the full purchase result with entitlements and store transaction details.
+  Stream<QPurchaseResult> get deferredPurchaseStream;
+
   /// Yields an event each time a promo transaction happens on iOS.
   /// Returns App Store product ID
   Stream<String> get promoPurchasesStream;

macos/Classes/SwiftQonversionPlugin.swift

@@ -8,6 +8,7 @@ import QonversionSandwich
 
 public class SwiftQonversionPlugin: NSObject, FlutterPlugin {
   var updatedEntitlementsStreamHandler: BaseEventStreamHandler?
+  var deferredPurchaseStreamHandler: BaseEventStreamHandler?
   var qonversionSandwich: QonversionSandwich?
 
   public static func register(with registrar: FlutterPluginRegistrar) {
@@ -25,6 +26,10 @@ public class SwiftQonversionPlugin: NSObject, FlutterPlugin {
     let updatedEntitlementsListener = FlutterListenerWrapper<BaseEventStreamHandler>(registrar, postfix: "updated_entitlements")
     updatedEntitlementsListener.register() { instance.updatedEntitlementsStreamHandler = $0 }
 
+    // Register deferred purchase events
+    let deferredPurchaseListener = FlutterListenerWrapper<BaseEventStreamHandler>(registrar, postfix: "deferred_purchase")
+    deferredPurchaseListener.register() { instance.deferredPurchaseStreamHandler = $0 }
+
     // Register sandwich
     let sandwichInstance = QonversionSandwich.init(qonversionEventListener: instance)
     instance.qonversionSandwich = sandwichInstance
@@ -387,6 +392,15 @@ extension SwiftQonversionPlugin: QonversionEventListener {
     }
   }
 
+  public func qonversionDidCompleteDeferredPurchase(_ purchaseResult: [String : Any]) {
+    guard let jsonData = purchaseResult.toJson() else {
+      return
+    }
+    DispatchQueue.main.async {
+      self.deferredPurchaseStreamHandler?.eventSink?(jsonData)
+    }
+  }
+
   public func shouldPurchasePromoProduct(with productId: String) {
     // Promo purchases are not supported on MacOS.
   }

macos/qonversion_flutter.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.dependency 'FlutterMacOS'
   s.platform = :osx, '10.12'
-  s.dependency "QonversionSandwich", "7.7.0"
+  s.dependency "QonversionSandwich", "7.8.0"
 
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
   s.swift_version = '5.0'

pubspec.yaml

@@ -1,6 +1,6 @@
 name: qonversion_flutter
 description: Flutter plugin to implement in-app subscriptions and purchases. Validate user receipts and manage cross-platform access to paid content on your app. Android & iOS.
-version: 11.5.0
+version: 11.6.0
 homepage: 'https://qonversion.io'
 repository: 'https://github.com/qonversion/flutter-sdk'