Merge pull request #174 from qonversion/release/4.6.0

Release 4.6.0

Author: SpertsyanKM

.github/workflows/publish.yml

@@ -0,0 +1,51 @@
+name: Publish
+
+on:
+  release:
+    types: [released]
+
+jobs:
+  publish:
+    name: Upload flutter SDK
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+      - name: Flutter version
+        run: flutter --version
+
+      - name: Cache pub dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.FLUTTER_HOME }}/.pub-cache
+          key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.lock') }}
+          restore-keys: ${{ runner.os }}-pub-
+
+      - name: Download pub dependencies
+        run: flutter pub get
+
+      - name: Setup Pub Credentials
+        run: |
+          mkdir -p $HOME/.config/dart
+          cat <<EOF > $HOME/.config/dart/pub-credentials.json
+          {
+            "accessToken": "${{ secrets.PUB_DEV_PUBLISH_ACCESS_TOKEN }}",
+            "refreshToken": "${{ secrets.PUB_DEV_PUBLISH_REFRESH_TOKEN }}",
+            "idToken": "${{ secrets.PUB_DEV_PUBLISH_ID_TOKEN }}",
+            "tokenEndpoint": "${{ secrets.PUB_DEV_PUBLISH_TOKEN_ENDPOINT }}",
+            "scopes": [ "openid", "https://www.googleapis.com/auth/userinfo.email" ],
+            "expiration": ${{ secrets.PUB_DEV_PUBLISH_EXPIRATION }}
+          }
+          EOF
+
+      - name: Check Publish Warnings
+        run: flutter pub publish --dry-run
+
+      - name: Publish SDK
+        run: flutter pub publish -f

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.6.0
+* Added a `source` property to the `Permission` object - use it to know where this permission is originally from - App Store, Play Store, Stripe, etc.
+* Added a method `getNotificationCustomPayload` to get the extra data you've added to automation notifications.
+* Added a method `presentCodeRedemptionSheet` to show up a sheet for users to redeem AppStore offer codes (iOS 14+ only).
+* Purchase tracking error handling improved to guarantee delivery.
+
 ## 4.5.2
 * Added a new user property `AppSetId` - a unique user identifier for all the developer's applications. May be used for some integrations.
 

android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.qonversion.flutter.sdk.qonversion_flutter_sdk'
-version '4.4.0'
+version '4.6.0'
 
 buildscript {
     ext.kotlin_version = '1.3.50'
@@ -41,6 +41,6 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'io.qonversion.sandwich:sandwich:0.1.2'
+    implementation 'io.qonversion.sandwich:sandwich:0.2.0'
     implementation 'com.google.code.gson:gson:2.8.6'
 }

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

@@ -129,6 +129,7 @@ class QonversionFlutterSdkPlugin : MethodCallHandler, FlutterPlugin, ActivityAwa
             "setPermissionsCacheLifetime" -> setPermissionsCacheLifetime(args, result)
             "setNotificationsToken" -> setNotificationsToken(args["notificationsToken"] as? String, result)
             "handleNotification" -> handleNotification(args, result)
+            "getNotificationCustomPayload" -> getNotificationCustomPayload(args, result)
             else -> result.notImplemented()
         }
     }
@@ -286,6 +287,18 @@ class QonversionFlutterSdkPlugin : MethodCallHandler, FlutterPlugin, ActivityAwa
         result.success(isQonversionNotification)
     }
 
+    private fun getNotificationCustomPayload(args: Map<String, Any>, result: Result) {
+        val data = args["notificationData"] as? Map<String, Any> ?: return result.noDataError()
+
+        if (data.isEmpty()) {
+            return result.noDataError()
+        }
+
+        val payload = qonversionSandwich.getNotificationCustomPayload(data)
+        val payloadJson = Gson().toJson(payload)
+        result.success(payloadJson)
+    }
+
     private fun storeSdkInfo(args: Map<String, Any>, result: Result) {
         val version = args["version"] as? String ?: return result.noSdkInfo()
         val source = args["source"] as? String ?: return result.noSdkInfo()

ios/Classes/SwiftQonversionFlutterSdkPlugin.swift

@@ -69,6 +69,9 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
       qonversionSandwich?.logout()
       return result(nil)
 
+    case "presentCodeRedemptionSheet":
+      return presentCodeRedemptionSheet(result)
+
     default:
       break
     }
@@ -123,6 +126,9 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     case "handleNotification":
       return handleNotification(args, result)
 
+    case "getNotificationCustomPayload":
+      return getNotificationCustomPayload(args, result)
+
     default:
       return result(FlutterMethodNotImplemented)
     }
@@ -283,6 +289,22 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     result(isPushHandled)
   }
 
+  private func getNotificationCustomPayload(_ args: [AnyHashable: Any], _ result: @escaping FlutterResult) {
+    guard let notificationData = args["notificationData"] as? [AnyHashable: Any] else {
+      return result(FlutterError.noData)
+    }
+
+    let customPayload: [AnyHashable: Any]? = qonversionSandwich?.getNotificationCustomPayload(notificationData)
+    result(customPayload?.toJson())
+  }
+
+  private func presentCodeRedemptionSheet(_ result: @escaping FlutterResult) {
+    if #available(iOS 14.0, *) {
+      qonversionSandwich?.presentCodeRedemptionSheet()
+    }
+    result(nil)
+  }
+
   private func getDefaultCompletion(_ result: @escaping FlutterResult) -> BridgeCompletion {
     return { data, error in
       if let error = error {

ios/qonversion_flutter.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'qonversion_flutter'
-  s.version          = '4.4.0'
+  s.version          = '4.6.0'
   s.summary          = 'Flutter Qonversion SDK'
   s.description      = <<-DESC
   Powerful yet simple subscription analytics
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
   s.platform = :ios, '9.0'
-  s.dependency 'QonversionSandwich', '0.1.2'
+  s.dependency 'QonversionSandwich', '0.2.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/constants.dart

@@ -47,6 +47,8 @@ class Constants {
       'setAppleSearchAdsAttributionEnabled';
   static const mSetNotificationsToken = 'setNotificationsToken';
   static const mHandleNotification = 'handleNotification';
+  static const mGetNotificationCustomPayload = 'getNotificationCustomPayload';
+  static const mPresentCodeRedemptionSheet = 'presentCodeRedemptionSheet';
 
   // Numeric constants
   static const skuDetailsPriceRatio = 1000000;

lib/src/models/permission.dart

@@ -1,4 +1,5 @@
 import 'package:json_annotation/json_annotation.dart';
+import 'package:qonversion_flutter/src/models/permission_source.dart';
 import 'package:qonversion_flutter/src/models/product_renew_state.dart';
 import 'package:qonversion_flutter/src/models/utils/mapper.dart';
 
@@ -25,6 +26,13 @@ class QPermission {
   )
   final QProductRenewState renewState;
 
+  /// A source determining where this permission is originally from - App Store, Play Store, Stripe, etc.
+  @JsonKey(
+    name: 'source',
+    unknownEnumValue: QPermissionSource.unknown,
+  )
+  final QPermissionSource source;
+
   /// Purchase date
   @JsonKey(
     name: 'startedTimestamp',
@@ -49,6 +57,7 @@ class QPermission {
     this.permissionId,
     this.productId,
     this.renewState,
+    this.source,
     this.startedDate,
     this.expirationDate,
     this.isActive,

lib/src/models/permission.g.dart

@@ -0,0 +1,18 @@
+import 'package:json_annotation/json_annotation.dart';
+
+enum QPermissionSource {
+  @JsonValue("Unknown")
+  unknown,
+
+  @JsonValue("AppStore")
+  appStore,
+
+  @JsonValue("PlayStore")
+  playStore,
+
+  @JsonValue("Stripe")
+  stripe,
+
+  @JsonValue("Manual")
+  manual,
+}