Merge branch 'release/1.0.0'

Author: iVirn

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.0
+
+* API update: new `launch` method with just one API key argument for both platforms. Contact us at [email protected] to merge your old API keys into one, [we can do it now](https://qonversion.io/docs/crossplatform-project).
+* API update: Remove old `launch` method; remove all old `launch...` methods.
+* Add `trackPurchase` method to track Android purchases manually.
+* Add `addAttributionData` method implementation for Android.
+
 ## 0.3.0
 
 * API update: new `launch` method, deprecate all old `launch...` methods

README.md

@@ -16,12 +16,15 @@ To use Qonversion in your Flutter app, add `qonversion` as a [dependency in your
 
 ```
 dependencies:
-  qonversion_flutter: ^0.3.0
+  qonversion_flutter: ^1.0.0
 ```
 
 Run `flutter pub get` to install dependency.
 
 ## Usage 
+
+### Setup
+
 You need to configure Qonversion once at a starting point of your app. 
 
 For example, launch Qonversion in `initState` of your top level widget: 
@@ -42,28 +45,42 @@ void initState() {
 }
 
 Future<String> _launchQonversion() async {
-  _qonversionUserId = await Qonversion.launch(
-    iosApiKey: 'YOUR_IOS_API_KEY',
-    androidApiKey: 'YOUR_ANDROID_API_KEY',
-  );
+  _qonversionUserId = await Qonversion.launch('YOUR_API_KEY');
 }
 
 ...
 ```
 
-Qonversion will track purchases automatically.
+**IMPORTANT**
+
+On Android you must call `Qonversion.trackPurchase(skuDetails, purchase)` method on each purchase success in order to track purchases.
+
+On iOS Qonversion will track purchases automatically.
 
 You can also specify your client side `userId` (instead of Qonversion user-id) that will be used for matching data in the third party data:
 
 ```
 final userId = 'CLIENT_SIDE_USER_ID';
 Qonversion.launch(
-  iosApiKey: 'YOUR_IOS_API_KEY',
-  androidApiKey: 'YOUR_ANDROID_API_KEY',
+  'YOUR_API_KEY',
   userId: userId,
 );
 ```
 
+### Attribution
+You need to have AppsFlyer SDK integrated in your app before starting with this integration. If you do not have Appsflyer integration yet, please use [this docs](https://pub.dev/packages/appsflyer_sdk#-readme-tab-). 
+
+On iOS you can also use Branch integration. 
+
+Use `addAttributionData(data, provider, userId)` method to pass attribution data dictionary: 
+```
+Qonversion.addAttributionData(
+  data, 
+  QAttributionProvider.appsFlyer,
+  'USER_ID',
+)
+```
+
 ## License
 
 Qonversion SDK is available under the MIT license.

android/build.gradle

@@ -41,5 +41,5 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.qonversion.android.sdk:sdk:0.3.0"
+    implementation "com.qonversion.android.sdk:sdk:1.0.5"
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Sun Jul 05 12:59:07 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/FlutterResult+CustomErrors.kt

@@ -18,6 +18,14 @@ fun MethodChannel.Result.noAutoTrackPurchasesError() {
     return this.error("3", "Could not find autoTrackPurchases boolean value", "Make sure you pass Map as call arguments")
 }
 
+fun MethodChannel.Result.noDataError() {
+    return this.error("4", "Could not find data", "Please make sure you pass a valid value")
+}
+
+fun MethodChannel.Result.noProviderError() {
+    return this.error("5", "Could not find provider", "Please make sure you pass a valid value")
+}
+
 fun MethodChannel.Result.qonversionError(message: String, cause: String) {
     return this.error("9", message, cause)
 }

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

@@ -2,15 +2,17 @@ package com.qonversion.flutter.sdk.qonversion_flutter_sdk
 
 import android.app.Activity
 import android.app.Application
-import androidx.annotation.NonNull;
+import androidx.annotation.NonNull
+import com.android.billingclient.api.Purchase
+import com.android.billingclient.api.SkuDetails
+import com.qonversion.android.sdk.AttributionSource
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
 import io.flutter.plugin.common.PluginRegistry.Registrar
 
-import com.qonversion.android.sdk.Qonversion;
-import com.qonversion.android.sdk.QonversionBillingBuilder
+import com.qonversion.android.sdk.Qonversion
 import com.qonversion.android.sdk.QonversionCallback
 
 /** QonversionFlutterSdkPlugin */
@@ -27,40 +29,24 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
     }
 
     override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
-        val args = call.arguments<Map<String, Any>>()
+        val args = call.arguments() as? Map<String, Any> ?: return result.noArgsError()
 
-        if (args == null || args.isEmpty()) {
-            result.noArgsError()
-            return
+        if (args.isEmpty()) {
+            return result.noArgsError()
         }
 
-        val apiKey = call.argument<String>("key")
-        if (apiKey == null) {
-            result.noApiKeyError()
-            return
-        }
-
-        val internalUserId = args["userID"] as? String ?: ""
-        val autoTrackPurchases = args["autoTrackPurchases"] as? Boolean ?: true
-
         when (call.method) {
-            "launch" -> launch(apiKey, args, result)
-
-            // TODO remove when old methods get removed on Dart side
-            "launchWithKeyCompletion",
-            "launchWithKeyUserId",
-            "launchWithKeyAutoTrackPurchasesCompletion" -> launchWith(apiKey, internalUserId, autoTrackPurchases, result)
-            "addAttributionData" -> result.notImplemented() // since there is no such method in Android SDK
+            "launch" -> launch(args, result)
+            "trackPurchase" -> trackPurchase(args, result)
+            "addAttributionData" -> addAttributionData(args, result)
             else -> result.notImplemented()
         }
     }
 
-    private fun launch(apiKey: String, args: Map<String, Any>, result: Result) {
-        val userId = args["userID"] as? String ?: ""
+    private fun launch(args: Map<String, Any>, result: Result) {
+        val apiKey = args["key"] as? String ?: return result.noApiKeyError()
 
-        val billingBuilder = QonversionBillingBuilder()
-                .enablePendingPurchases()
-                .setListener { _, _ ->  }
+        val userId = args["userID"] as? String ?: ""
 
         val callback = object: QonversionCallback {
             override fun onSuccess(uid: String) {
@@ -76,24 +62,18 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
                 application,
                 apiKey,
                 userId,
-                billingBuilder,
-                true,
                 callback
         )
     }
 
-    // TODO remove when old methods get removed on Dart side
-    private fun launchWith(key: String?,
-                           internalUserId: String = "",
-                           autoTrackPurchases: Boolean = true,
-                           result: Result) {
-        if (key == null) {
-          return result.error("1", "Could not find API key", "Please provide valid API key")
-        }
+    private fun trackPurchase(args: Map<String, Any>, result: Result) {
+        @Suppress("UNCHECKED_CAST")
+        val detailsMap = args["details"] as Map<String, Any>
+        @Suppress("UNCHECKED_CAST")
+        val purchaseMap = args["purchase"] as Map<String, Any>
 
-        val billingBuilder = QonversionBillingBuilder()
-                .enablePendingPurchases()
-                .setListener { _, _ ->  }
+        val details = createSkuDetails(detailsMap)
+        val purchase = createPurchase(purchaseMap)
 
         val callback = object: QonversionCallback {
             override fun onSuccess(uid: String) {
@@ -105,13 +85,40 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
             }
         }
 
-        Qonversion.initialize(
-                application,
-                key,
-                internalUserId,
-                billingBuilder,
-                autoTrackPurchases,
-                callback
-        )
+        Qonversion.instance?.purchase(details, purchase, callback)
+    }
+
+    private fun addAttributionData(args: Map<String, Any>, result: Result) {
+        @Suppress("UNCHECKED_CAST")
+        val data = args["data"] as? Map<String, Any> ?: return result.noDataError()
+
+        if (data.isEmpty()) {
+            return result.noDataError()
+        }
+
+        val provider = args["provider"] as? String ?: return result.noProviderError()
+
+        val uid = args["userId"] as? String ?: return result.noUserIdError()
+
+        val castedProvider = when (provider) {
+            "appsFlyer" -> AttributionSource.APPSFLYER
+            else -> null
+        }
+                ?: return result.success(null)
+
+        Qonversion.instance?.attribution(data, castedProvider, uid)
+
+        result.success(null)
+    }
+
+    private fun createSkuDetails(map: Map<String, Any>): SkuDetails {
+        val json = map.toString()
+        return SkuDetails(json)
+    }
+
+    private fun createPurchase(map: Map<String, Any>): Purchase {
+        val json = map.toString()
+        val signature = map["signature"] as String
+        return Purchase(json, signature)
     }
 }

example/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Sun Jul 05 12:39:57 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

example/lib/main.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'dart:async';
 
-import 'package:qonversion_flutter/qonversion.dart';
+import 'package:qonversion_flutter/qonversion_flutter.dart';
 
 void main() => runApp(MyApp());
 
@@ -22,10 +22,7 @@ class _MyAppState extends State<MyApp> {
   Future<void> initPlatformState() async {
     String uid;
     try {
-      uid = await Qonversion.launch(
-        iosApiKey: '',
-        androidApiKey: '',
-      );
+      uid = await Qonversion.launch('');
       print(uid);
     } catch (e) {
       print('Failed to obtain uid from Qonversion.');

ios/Classes/SwiftQonversionFlutterSdkPlugin.swift

@@ -24,25 +24,6 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
         case "launch":
             launch(with: apiKey, args, result)
 
-        case "launchWithKeyCompletion":
-            launch(with: apiKey, result)
-            
-        case "launchWithKeyUserId":
-            guard let userID = args["userID"] as? String else {
-                result(FlutterError.noUserId)
-                return
-            }
-            
-            launch(with: apiKey, userID: userID, result)
-            
-        case "launchWithKeyAutoTrackPurchasesCompletion":
-            guard let autoTrackPurchases = args["autoTrackPurchases"] as? Bool else {
-                result(FlutterError.noAutoTrackPurchases)
-                return
-            }
-            
-            launch(with: apiKey, autoTrackPurchases: autoTrackPurchases, result)
-            
         case "addAttributionData":
             addAttributionData(args: args, result)
 
@@ -66,24 +47,6 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
         }
     }
 
-    private func launch(with key: String, _ result: @escaping FlutterResult) {
-        Qonversion.launch(withKey: key) { uid in
-            result(uid)
-        }
-    }
-    
-    private func launch(with key: String, userID: String, _ result: @escaping FlutterResult) {
-        Qonversion.launch(withKey: key, userID: userID)
-        
-        result(nil)
-    }
-    
-    private func launch(with key: String, autoTrackPurchases: Bool, _ result: @escaping FlutterResult) {
-        Qonversion.launch(withKey: key, autoTrackPurchases: autoTrackPurchases) { uid in
-            result(uid)
-        }
-    }
-    
     private func addAttributionData(args: [String: Any], _ result: @escaping FlutterResult) {
         guard let data = args["data"] as? [AnyHashable: Any] else {
             result(FlutterError.noData)
@@ -95,6 +58,11 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
             return
         }
 
+        guard let userId = args["userId"] as? String else {
+            result(FlutterError.noUserId)
+            return
+        }
+        
         // Using appsFlyer by default since there are only 2 cases in an enum yet.
         var castedProvider = QAttributionProvider.appsFlyer
 
@@ -105,7 +73,7 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
             break
         }
 
-        Qonversion.addAttributionData(data, from: castedProvider)
+        Qonversion.addAttributionData(data, from: castedProvider, userID: userId)
 
         result(nil)
     }

ios/qonversion_flutter.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'qonversion_flutter'
-  s.version          = '0.3.0'
+  s.version          = '1.0.0'
   s.summary          = 'Flutter Qonversion SDK'
   s.description      = <<-DESC
   Powerful yet simple subscription analytics