Merge pull request #55 from qonversion/release/2.4.1

Release/2.4.1

Author: Maria-Bordunova

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.4.1
+* Internal logic optimization and minor improvements
+
 ## 2.4.0
 * Add deferred purchases feature
 

android/build.gradle

@@ -1,9 +1,9 @@
 group 'com.qonversion.flutter.sdk.qonversion_flutter_sdk'
-version '2.4.0'
+version '2.4.1'
 
 buildscript {
     ext.kotlin_version = '1.3.50'
-    ext.qonversion_version = '2.7.1'
+    ext.qonversion_version = '2.7.2'
     repositories {
         google()
         jcenter()

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

@@ -59,3 +59,7 @@ fun MethodChannel.Result.noPropertyValue() {
 fun MethodChannel.Result.offeringsError(description: String?, message: String?) {
     return this.error("OFFERINGS", "Could not get offerings", "$description $message")
 }
+
+fun MethodChannel.Result.noSdkInfo() {
+    return this.error("15", "Could not find sdk info", passValidValue)
+}

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

@@ -3,6 +3,7 @@ package com.qonversion.flutter.sdk.qonversion_flutter_sdk
 import android.app.Activity
 import android.app.Application
 import androidx.annotation.NonNull
+import androidx.preference.PreferenceManager
 import com.google.gson.Gson
 import com.qonversion.android.sdk.*
 import io.flutter.plugin.common.MethodCall
@@ -75,6 +76,7 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
             "setUserProperty" -> setUserProperty(args, result)
             "addAttributionData" -> addAttributionData(args, result)
             "checkTrialIntroEligibility" -> checkTrialIntroEligibility(args, result)
+            "storeSdkInfo" -> storeSdkInfo(args, result)
             else -> result.notImplemented()
         }
     }
@@ -132,7 +134,7 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
         val newProductId = args["newProductId"] as? String ?: return result.noNewProductIdError()
         val oldProductId = args["oldProductId"] as? String ?: return result.noOldProductIdError()
         val prorationMode = args["proration_mode"] as? Int
-        
+
         Qonversion.updatePurchase(activity, newProductId, oldProductId, prorationMode, callback = object: QonversionPermissionsCallback {
             override fun onSuccess(permissions: Map<String, QPermission>) {
                 result.success(permissions.mapValues { it.value.toMap() })
@@ -264,4 +266,18 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
             }
         })
     }
+
+    private fun storeSdkInfo(args: Map<String, Any>, result: Result) {
+        val version = args["version"] as? String ?: return result.noSdkInfo()
+        val versionKey = args["versionKey"] as? String ?: return result.noSdkInfo()
+        val source = args["source"] as? String ?: return result.noSdkInfo()
+        val sourceKey = args["sourceKey"] as? String ?: return result.noSdkInfo()
+
+        val editor = PreferenceManager.getDefaultSharedPreferences(application).edit()
+        editor.putString(sourceKey, source)
+        editor.putString(versionKey, version)
+        editor.apply()
+
+        result.success(null)
+    }
 }

ios/Classes/FlutterError+Custom.swift

@@ -61,12 +61,16 @@ extension FlutterError {
                                        details: passValidValue)
 
   static let noPropertyValue = FlutterError(code: "14",
-                                       message: "Could not find property value",
-                                       details: passValidValue)
+                                            message: "Could not find property value",
+                                            details: passValidValue)
 
   static func offeringsError(_ description: String) -> FlutterError {
     return FlutterError(code: "OFFERINGS",
                         message: "Could not get offerings",
                         details: description)
   }
+  
+  static let noSdkInfo = FlutterError(code: "15",
+                                      message: "Could not find sdk info",
+                                      details: passValidValue)
 }

ios/Classes/SwiftQonversionFlutterSdkPlugin.swift

@@ -25,7 +25,7 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     switch (call.method) {
     case "products":
       return products(result)
-    
+      
     case "checkPermissions":
       return checkPermissions(result)
 
@@ -52,7 +52,7 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     switch call.method {
     case "launch":
       return launch(with: args["key"] as? String, result)
-    
+      
     case "purchase":
       return purchase(args["productId"] as? String, result)
 
@@ -71,6 +71,9 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     case "checkTrialIntroEligibility":
       return checkTrialIntroEligibility(args, result)
 
+    case "storeSdkInfo":
+      return storeSdkInfo(args, result)
+      
     default:
       return result(FlutterMethodNotImplemented)
     }
@@ -165,11 +168,11 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
 
   private func setProperty(_ args: [String: Any], _ result: @escaping FlutterResult) {
     guard let rawProperty = args["property"] as? String else {
-      return result(FlutterError.noData)
+      return result(FlutterError.noProperty)
     }
 
     guard let value = args["value"] as? String else {
-      return result(FlutterError.noProvider)
+      return result(FlutterError.noPropertyValue)
     }
 
     do {
@@ -183,14 +186,14 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
       result(FlutterError.qonversionError(error.localizedDescription))
     }
   }
-    
+  
   private func setUserProperty(_ args: [String: Any], _ result: @escaping FlutterResult) {
     guard let property = args["property"] as? String else {
-      return result(FlutterError.noData)
+      return result(FlutterError.noProperty)
     }
 
     guard let value = args["value"] as? String else {
-      return result(FlutterError.noProvider)
+      return result(FlutterError.noPropertyValue)
     }
 
     Qonversion.setUserProperty(property, value: value)
@@ -212,6 +215,22 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     }
   }
 
+  private func storeSdkInfo(_ args: [String: Any], _ result: @escaping FlutterResult) {
+    guard let version = args["version"] as? String,
+        let source = args["source"] as? String,
+        let sourceKey = args["sourceKey"] as? String,
+        let versionKey = args["versionKey"] as? String
+    else {
+        return result(FlutterError.noSdkInfo)
+    }
+    
+    let defaults = UserDefaults.standard
+    defaults.set(version, forKey: versionKey)
+    defaults.set(source, forKey: sourceKey)
+    
+    result(nil)
+  }
+  
   private func addAttributionData(_ args: [String: Any], _ result: @escaping FlutterResult) {
     guard let data = args["data"] as? [AnyHashable: Any] else {
       return result(FlutterError.noData)

ios/qonversion_flutter.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'qonversion_flutter'
-  s.version          = '2.4.0'
+  s.version          = '2.4.1'
   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 'Qonversion', '2.11.2'
+  s.dependency 'Qonversion', '2.11.3'
 
   # 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

@@ -31,4 +31,10 @@ class Constants {
   static const mSetDebugMode = 'setDebugMode';
   static const mOfferings = 'offerings';
   static const mCheckTrialIntroEligibility = 'checkTrialIntroEligibility';
+  static const mStoreSdkInfo = 'storeSdkInfo';
+
+  // Keys for NSUserDefaults on iOS and SharedPreferences on Android
+  static const keyPrefix = 'com.qonversion.keys';
+  static const sourceKey = '$keyPrefix.source';
+  static const versionKey = '$keyPrefix.sourceVersion';
 }

lib/src/qonversion.dart

@@ -16,6 +16,8 @@ import 'models/purchase_exception.dart';
 import 'qa_provider.dart';
 
 class Qonversion {
+  static const String _sdkVersion = "2.4.1";
+
   static const MethodChannel _channel = MethodChannel('qonversion_flutter_sdk');
   static const _purchasesEventChannel =
       EventChannel('qonversion_flutter_updated_purchases');
@@ -38,6 +40,8 @@ class Qonversion {
     String apiKey, {
     @required bool isObserveMode,
   }) async {
+    _storeSdkInfo();
+
     final args = {
       Constants.kApiKey: apiKey,
       Constants.kObserveMode: isObserveMode,
@@ -218,4 +222,13 @@ class Qonversion {
     return decodedEligibilities
         .map((key, value) => MapEntry(key, QEligibility.fromJson(value)));
   }
+
+  // Private methods
+  static Future<void> _storeSdkInfo() =>
+      _channel.invokeMethod(Constants.mStoreSdkInfo, {
+        "version": _sdkVersion,
+        "versionKey": Constants.versionKey,
+        "source": "flutter",
+        "sourceKey": Constants.sourceKey
+      });
 }

pubspec.lock

@@ -91,7 +91,7 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.0.0"
+    version: "8.0.2"
   characters:
     dependency: transitive
     description: