Merge pull request #72 from qonversion/release/3.0.1

Release/3.0.1

Author: Maria-Bordunova

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.1
+* Fix QOfferings mapping error
+* Internal logic optimization for Android
+
 ## 3.0.0
 * Add null safety support 
 * Increase min Dart SDK version to 2.12.0

android/build.gradle

@@ -1,9 +1,9 @@
 group 'com.qonversion.flutter.sdk.qonversion_flutter_sdk'
-version '3.0.0'
+version '3.0.1'
 
 buildscript {
     ext.kotlin_version = '1.3.50'
-    ext.qonversion_version = '2.7.2'
+    ext.qonversion_version = '2.7.6'
     repositories {
         google()
         jcenter()
@@ -42,6 +42,6 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.qonversion.android.sdk:sdk:$qonversion_version"
+    implementation "io.qonversion.android.sdk:sdk:$qonversion_version"
     implementation 'com.google.code.gson:gson:2.8.6'
 }

ios/qonversion_flutter.podspec

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

lib/src/models/utils/mapper.dart

@@ -1,3 +1,7 @@
+import 'dart:convert';
+
+import '../eligibility.dart';
+import '../offerings.dart';
 import '../permission.dart';
 import '../product.dart';
 import '../sk_product/discount.dart';
@@ -28,6 +32,23 @@ class QMapper {
     });
   }
 
+  static QOfferings offeringsFromJson(String? jsonString) {
+    if (jsonString == null) return QOfferings(null, <QOffering>[]);
+
+    final offeringJson = Map<String, dynamic>.from(jsonDecode(jsonString));
+
+    return QOfferings.fromJson(offeringJson);
+  }
+
+  static Map<String, QEligibility> eligibilityFromJson(String? jsonString) {
+    if (jsonString == null) return <String, QEligibility>{};
+
+    final eligibilityJson = Map<String, dynamic>.from(jsonDecode(jsonString));
+
+    return eligibilityJson
+        .map((key, value) => MapEntry(key, QEligibility.fromJson(value)));
+  }
+
   static SKProductWrapper? skProductFromJson(dynamic json) {
     if (json == null) return null;
 

lib/src/qonversion.dart

@@ -16,7 +16,7 @@ import 'models/purchase_exception.dart';
 import 'qa_provider.dart';
 
 class Qonversion {
-  static const String _sdkVersion = "3.0.0";
+  static const String _sdkVersion = "3.0.1";
 
   static const MethodChannel _channel = MethodChannel('qonversion_flutter_sdk');
   static const _purchasesEventChannel =
@@ -207,27 +207,20 @@ class Qonversion {
   /// See [Offerings](https://qonversion.io/docs/offerings) for more details.
   /// See [Product Center](https://qonversion.io/docs/product-center) for more details.
   static Future<QOfferings> offerings() async {
-    final offeringsString =
-        await (_channel.invokeMethod<String>(Constants.mOfferings) as FutureOr<String>);
+    final offeringsString = await _channel.invokeMethod<String>(Constants.mOfferings);
 
-    final Map<String, dynamic> decodedOfferings = jsonDecode(offeringsString);
-
-    return QOfferings.fromJson(decodedOfferings);
+    return QMapper.offeringsFromJson(offeringsString);
   }
 
   /// You can check if a user is eligible for an introductory offer, including a free trial.
   /// You can show only a regular price for users who are not eligible for an introductory offer.
   /// [ids] products identifiers that must be checked
   static Future<Map<String, QEligibility>> checkTrialIntroEligibility(
       List<String> ids) async {
-    final eligibilitiesString = await (_channel.invokeMethod<String>(
-        Constants.mCheckTrialIntroEligibility, {"ids": ids}) as FutureOr<String>);
-
-    final Map<String, dynamic> decodedEligibilities =
-        jsonDecode(eligibilitiesString);
+    final eligibilitiesString = await _channel.invokeMethod<String>(
+        Constants.mCheckTrialIntroEligibility, {"ids": ids});
 
-    return decodedEligibilities
-        .map((key, value) => MapEntry(key, QEligibility.fromJson(value)));
+    return QMapper.eligibilityFromJson(eligibilitiesString);
   }
 
   // Private methods

macos/qonversion_flutter.podspec

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

pubspec.yaml

@@ -1,6 +1,6 @@
 name: qonversion_flutter
 description: In-App Subscription Infrastructure to grow your subscription business
-version: 3.0.0
+version: 3.0.1
 homepage: 'https://qonversion.io'
 repository: 'https://github.com/qonversion/flutter-sdk'