Merge branch 'develop' into update_native_iOS

Author: Maria-Bordunova

android/build.gradle

@@ -3,7 +3,7 @@ version '4.2.0'
 
 buildscript {
     ext.kotlin_version = '1.3.50'
-    ext.qonversion_version = '3.2.2'
+    ext.qonversion_version = '3.2.4'
     repositories {
         google()
         jcenter()

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

@@ -109,7 +109,6 @@ class QonversionFlutterSdkPlugin : MethodCallHandler, FlutterPlugin, ActivityAwa
             "purchaseProduct" -> purchaseProduct(args["product"] as? String, result)
             "updatePurchase" -> updatePurchase(args, result)
             "updatePurchaseWithProduct" -> updatePurchaseWithProduct(args, result)
-            "setUserId" -> setUserId(args["userId"] as? String, result)
             "setProperty" -> setProperty(args, result)
             "setUserProperty" -> setUserProperty(args, result)
             "addAttributionData" -> addAttributionData(args, result)
@@ -280,16 +279,6 @@ class QonversionFlutterSdkPlugin : MethodCallHandler, FlutterPlugin, ActivityAwa
         })
     }
 
-    private fun setUserId(userId: String?, result: Result) {
-        if (userId == null) {
-            result.noUserIdError()
-            return
-        }
-
-        Qonversion.setUserID(userId)
-        result.success(null)
-    }
-
     private fun setProperty(args: Map<String, Any>, result: Result) {
         val rawProperty = args["property"] as? String ?: return result.noProperty()
 
@@ -365,7 +354,7 @@ class QonversionFlutterSdkPlugin : MethodCallHandler, FlutterPlugin, ActivityAwa
         if (data.isEmpty()) {
             return result.noDataError()
         }
-       
+
         val stringsMap: Map<String, String> = data.mapValues { it.value.toString() }
         val isQonversionNotification = Qonversion.handleNotification(stringsMap)
         result.success(isQonversionNotification)

example/lib/home.dart

@@ -95,11 +95,11 @@ class _HomeViewState extends State<HomeView> {
                   Padding(
                     padding: const EdgeInsets.all(8.0),
                     child: FlatButton(
-                      child: Text('Set custom userId'),
-                      color: Colors.blue,
-                      textColor: Colors.white,
-                      onPressed: () => Qonversion.setUserId('userId'),
-                    ),
+                        child: Text('Set custom userId'),
+                        color: Colors.blue,
+                        textColor: Colors.white,
+                        onPressed: () => Qonversion.setProperty(
+                            QUserProperty.customUserId, 'userId')),
                   ),
                   Padding(
                     padding: const EdgeInsets.only(

example/lib/params_view.dart

@@ -22,7 +22,7 @@ class ParamsView extends StatelessWidget {
               color: Colors.green,
               textColor: Colors.white,
               onPressed: () {
-                Qonversion.setUserId('customId');
+                Qonversion.setProperty(QUserProperty.customUserId, 'customId');
                 print('did set user id');
               },
             ),

ios/Classes/Mapper.swift

@@ -118,6 +118,9 @@ extension Qonversion.Property {
     case "KochavaDeviceId":
       return .kochavaDeviceID
 
+    case "CustomUserId":
+      return .userID
+      
     default:
       throw ParsingError.runtimeError("Could not parse Qonversion.Property")
     }

ios/Classes/SwiftQonversionFlutterSdkPlugin.swift

@@ -90,9 +90,6 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     case "promoPurchase":
       return promoPurchase(args["productId"] as? String, result)
 
-    case "setUserId":
-      return setUserId(args["userId"] as? String, result)
-      
     case "addAttributionData":
       return addAttributionData(args, result)
 
@@ -264,16 +261,6 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     }
   }
 
-  private func setUserId(_ userId: String?, _ result: @escaping FlutterResult) {
-    guard let userId = userId else {
-      result(FlutterError.noUserId)
-      return
-    }
-    
-    Qonversion.setUserID(userId)
-    result(nil)
-  }
-  
   private func setProperty(_ args: [String: Any], _ result: @escaping FlutterResult) {
     guard let rawProperty = args["property"] as? String else {
       return result(FlutterError.noProperty)

lib/src/constants.dart

@@ -30,7 +30,6 @@ class Constants {
   static const mUpdatePurchaseWithProduct = 'updatePurchaseWithProduct';
   static const mCheckPermissions = 'checkPermissions';
   static const mRestore = 'restore';
-  static const mSetUserId = 'setUserId';
   static const mSetProperty = 'setProperty';
   static const mSetUserProperty = 'setUserProperty';
   static const mSyncPurchases = 'syncPurchases';

lib/src/models/user_property.dart

@@ -4,4 +4,5 @@ enum QUserProperty {
   appsFlyerUserId,
   adjustAdId,
   kochavaDeviceId,
+  customUserId,
 }

lib/src/qonversion.dart

@@ -209,8 +209,10 @@ class Qonversion {
   /// Qonversion SDK provides an asynchronous method to set your side User ID that can be used to match users in third-party integrations.
   ///
   /// See more in [documentation](https://documentation.qonversion.io/docs/user-identifiers)
+  @Deprecated(
+      "Will be removed in a future major release. Use setProperty(QUserProperty.customUserId, 'value') instead.")
   static Future<void> setUserId(String userId) =>
-      _channel.invokeMethod(Constants.mSetUserId, {Constants.kUserId: userId});
+      setProperty(QUserProperty.customUserId, userId);
 
   /// Sets user property for pre-defined case property.
   ///