Merge pull request #21 from qonversion/feature/add_attribution_data

iVirn · web-flow · commit e6d6d092e36d · 2020-07-05T17:19:29.000+03:00
Add attribution data support
diff --git a/android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/FlutterResult+CustomErrors.kt b/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)
 }
diff --git a/android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/QonversionFlutterSdkPlugin.kt b/android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/QonversionFlutterSdkPlugin.kt
@@ -5,14 +5,14 @@ import android.app.Application
 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.QonversionCallback
 
 /** QonversionFlutterSdkPlugin */
@@ -35,18 +35,10 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
             return result.noArgsError()
         }
 
-        val internalUserId = args["userID"] as? String ?: ""
-        val autoTrackPurchases = args["autoTrackPurchases"] as? Boolean ?: true
-
         when (call.method) {
             "launch" -> launch(args, result)
             "trackPurchase" -> trackPurchase(args, result)
-
-            // TODO remove when old methods get removed on Dart side
-            "launchWithKeyCompletion",
-            "launchWithKeyUserId",
-            "launchWithKeyAutoTrackPurchasesCompletion" -> launchWith(args["key"] as String, internalUserId, autoTrackPurchases, result)
-            "addAttributionData" -> result.notImplemented() // since there is no such method in Android SDK
+            "addAttributionData" -> addAttributionData(args, result)
             else -> result.notImplemented()
         }
     }
@@ -74,18 +66,14 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
         )
     }
 
-    // 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) {
@@ -97,36 +85,30 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
             }
         }
 
-        Qonversion.initialize(
-                application,
-                key,
-                internalUserId,
-                billingBuilder,
-                autoTrackPurchases,
-                callback
-        )
+        Qonversion.instance?.purchase(details, purchase, callback)
     }
 
-    private fun trackPurchase(args: Map<String, Any>, result: Result) {
+    private fun addAttributionData(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 data = args["data"] as? Map<String, Any> ?: return result.noDataError()
 
-        val details = createSkuDetails(detailsMap)
-        val purchase = createPurchase(purchaseMap)
+        if (data.isEmpty()) {
+            return result.noDataError()
+        }
 
-        val callback = object: QonversionCallback {
-            override fun onSuccess(uid: String) {
-                result.success(uid)
-            }
+        val provider = args["provider"] as? String ?: return result.noProviderError()
 
-            override fun onError(t: Throwable) {
-                result.qonversionError(t.localizedMessage, t.cause.toString())
-            }
+        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)
 
-        Qonversion.instance!!.purchase(details, purchase, callback)
+        result.success(null)
     }
 
     private fun createSkuDetails(map: Map<String, Any>): SkuDetails {
diff --git a/ios/Classes/SwiftQonversionFlutterSdkPlugin.swift b/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)
     }
diff --git a/lib/src/constants.dart b/lib/src/constants.dart
@@ -1,19 +1,14 @@
 class Constants {
   // Params names
   static const kApiKey = 'key';
-  static const kUserId = 'userID';
-  static const kAutoTrackPurchases = 'autoTrackPurchases';
+  static const kUserId = 'userId';
   static const kData = 'data';
   static const kProvider = 'provider';
   static const kDetails = 'details';
   static const kPurchase = 'purchase';
 
   // MethodChannel methods names
   static const mLaunch = 'launch';
-  static const mLaunchWithKeyCompletion = 'launchWithKeyCompletion';
-  static const mLaunchWithKeyUserId = 'launchWithKeyUserId';
-  static const mLaunchWithKeyAutoTrackPurchasesCompletion =
-      'launchWithKeyAutoTrackPurchasesCompletion';
   static const mAddAttributionData = 'addAttributionData';
   static const mTrackPurchase = 'trackPurchase';
 }
diff --git a/lib/src/qonversion.dart b/lib/src/qonversion.dart
@@ -66,12 +66,19 @@ class Qonversion {
 
   /// Sends your attribution [data] to the [provider].
   ///
-  /// [userID], if specified, will also be sent to the provider
+  /// [userId], if specified, will also be sent to the provider.
+  /// Note that you can pass `null` as [userId] on iOS.
+  ///
+  /// On Android [userId] is non-nullable.
   static Future<void> addAttributionData(
-      Map<dynamic, dynamic> data, QAttributionProvider provider) {
+    Map<dynamic, dynamic> data, {
+    @required QAttributionProvider provider,
+    @required String userId,
+  }) {
     final args = {
       Constants.kData: data,
       Constants.kProvider: describeEnum(provider),
+      Constants.kUserId: userId,
     };
 
     return _channel.invokeMethod(Constants.mAddAttributionData, args);

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,14 @@ fun MethodChannel.Result.noAutoTrackPurchasesError() {`
`18`	`18`	`return this.error("3", "Could not find autoTrackPurchases boolean value", "Make sure you pass Map as call arguments")`
`19`	`19`	`}`
`20`	`20`
	`21`	`+fun MethodChannel.Result.noDataError() {`
	`22`	`+ return this.error("4", "Could not find data", "Please make sure you pass a valid value")`
	`23`	`+}`
	`24`	`+`
	`25`	`+fun MethodChannel.Result.noProviderError() {`
	`26`	`+ return this.error("5", "Could not find provider", "Please make sure you pass a valid value")`
	`27`	`+}`
	`28`	`+`
`21`	`29`	`fun MethodChannel.Result.qonversionError(message: String, cause: String) {`
`22`	`30`	`return this.error("9", message, cause)`
`23`	`31`	`}`