Merge branch 'release/1.1.2'

iVirn · iVirn · commit 8dae2ff0034c · 2020-11-30T19:50:51.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.2
+* Fix Android `manualTrackPurchase` args parsing
+* Update Example app
+
 ## 1.1.1
 * Update docs
 
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ To use Qonversion in your Flutter app, add `qonversion` as a [dependency in your
 
 ```
 dependencies:
-  qonversion_flutter: ^1.1.1
+  qonversion_flutter: ^1.1.2
 ```
 
 Run `flutter pub get` to install dependency.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 group 'com.qonversion.flutter.sdk.qonversion_flutter_sdk'
-version '1.1.1'
+version '1.1.2'
 
 buildscript {
     ext.kotlin_version = '1.3.50'
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
@@ -67,13 +67,12 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
     }
 
     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 detailsJson = args["details"] as String
+        val purchaseJson = args["purchase"] as String
+        val signature = args["signature"] as String
 
-        val details = createSkuDetails(detailsMap)
-        val purchase = createPurchase(purchaseMap)
+        val details = SkuDetails(detailsJson)
+        val purchase = Purchase(purchaseJson, signature)
 
         val callback = object: QonversionCallback {
             override fun onSuccess(uid: String) {
@@ -89,7 +88,6 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
     }
 
     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()) {
@@ -110,15 +108,4 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
 
         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)
-    }
 }
diff --git a/example/.gitignore b/example/.gitignore
@@ -34,6 +34,9 @@ pubspec.lock
 # iOS related
 ios/Podfile.lock
 
+# Android related
+android/keystore/
+
 # Web related
 lib/generated_plugin_registrant.dart
 
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -18,7 +18,7 @@ if (flutterVersionCode == null) {
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    flutterVersionName = '1.0.0'
 }
 
 apply plugin: 'com.android.application'
@@ -38,19 +38,35 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.qonversion.flutter.sdk.qonversion_flutter_sdk_example"
+        applicationId "com.qonversion.sample"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        release {
+            File propertiesFile = project.rootProject.file('local.properties')
+            if (propertiesFile.exists()) {
+                Properties properties = new Properties()
+                properties.load(propertiesFile.newDataInputStream())
+                storeFile file(properties.getProperty('storeFile'))
+                keyAlias properties.getProperty('keyAlias')
+                storePassword properties.getProperty('storePassword')
+                keyPassword properties.getProperty('keyPassword')
+            }
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
+        }
+        debug {
+            signingConfig signingConfigs.release
+            debuggable true
         }
     }
 }
diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.qonversion.flutter.sdk.qonversion_flutter_sdk_example">
+    package="com.qonversion.sample">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -1,13 +1,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.qonversion.flutter.sdk.qonversion_flutter_sdk_example">
+    package="com.qonversion.sample">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="com.android.vending.BILLING"/>
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="qonversion_flutter_sdk_example"
+        android:label="com.qonversion.sample"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
diff --git a/example/android/app/src/main/kotlin/com/qonversion/sample/MainActivity.kt b/example/android/app/src/main/kotlin/com/qonversion/sample/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.qonversion.flutter.sdk.qonversion_flutter_sdk_example
+package com.qonversion.sample
 
 import androidx.annotation.NonNull;
 import io.flutter.embedding.android.FlutterActivity
diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.qonversion.flutter.sdk.qonversion_flutter_sdk_example">
+    package="com.qonversion.sample">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -5,35 +5,32 @@ import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:qonversion_flutter/qonversion_flutter.dart';
 
-void main() => runApp(MyApp());
+void main() {
+  InAppPurchaseConnection.enablePendingPurchases();
+  runApp(MyApp());
+}
 
 class MyApp extends StatefulWidget {
   @override
   _MyAppState createState() => _MyAppState();
 }
 
 class _MyAppState extends State<MyApp> {
+  var _mockTrack = false;
   String _uid = 'Not Initialized Qonversion Yet';
+  StreamSubscription<List<PurchaseDetails>> _subscription;
+  List<ProductDetails> _products = [];
 
   @override
   void initState() {
     super.initState();
     initPlatformState();
   }
 
-  Future<void> initPlatformState() async {
-    String uid;
-    try {
-      uid = await Qonversion.launch('PV77YHL7qnGvsdmpTs7gimsxUvY-Znl2');
-      print(uid);
-    } catch (e) {
-      print('Failed to obtain uid from Qonversion.');
-      print(e);
-    }
-
-    if (!mounted) return;
-
-    setState(() => _uid = uid);
+  @override
+  void dispose() {
+    _subscription.cancel();
+    super.dispose();
   }
 
   @override
@@ -51,15 +48,34 @@ class _MyAppState extends State<MyApp> {
                 'Qonversion uid: \n$_uid\n',
                 textAlign: TextAlign.center,
               ),
+              if (_products.isNotEmpty)
+                Column(
+                  children: [
+                    for (final p in _products) Text(p.id),
+                  ],
+                ),
+              StreamBuilder<List<PurchaseDetails>>(
+                stream: InAppPurchaseConnection.instance.purchaseUpdatedStream,
+                initialData: [],
+                builder: (context, snapshot) {
+                  final details = <Widget>[];
+                  if (snapshot.hasData) {
+                    for (final detail in snapshot.data) {
+                      if (detail.status == PurchaseStatus.error) {
+                        continue;
+                      }
+                      details.add(Text(detail.productID));
+                    }
+                  }
+
+                  return Column(children: details);
+                },
+              ),
               FlatButton(
                 child: Text('Track'),
                 color: Colors.blue,
                 textColor: Colors.white,
-                onPressed: () async {
-                  final uid = await Qonversion.manualTrackPurchase(
-                      getProductDetails(), getPurchaseDetails());
-                  print(uid);
-                },
+                onPressed: makePurchase,
               ),
             ],
           ),
@@ -68,14 +84,85 @@ class _MyAppState extends State<MyApp> {
     );
   }
 
+  Future<void> initPlatformState() async {
+    String uid;
+    try {
+      uid = await Qonversion.launch('PV77YHL7qnGvsdmpTs7gimsxUvY-Znl2');
+      print('Did launch Q with uid: $uid');
+    } catch (e) {
+      print('Failed to obtain uid from Qonversion.');
+      print(e);
+    }
+
+    if (!mounted) return;
+
+    setState(() => _uid = uid);
+
+    final purchaseUpdates =
+        InAppPurchaseConnection.instance.purchaseUpdatedStream;
+    _subscription = purchaseUpdates.listen((purchases) {
+      _handlePurchaseUpdates(purchases);
+    });
+
+    final available = await InAppPurchaseConnection.instance.isAvailable();
+    if (!available) {
+      print('Store is not available');
+    }
+
+    final _kIds = Set<String>.from(['qonversion_inapp_consumable']);
+    final response =
+        await InAppPurchaseConnection.instance.queryProductDetails(_kIds);
+
+    for (final detail in response.productDetails) {
+      print(detail.id);
+    }
+
+    setState(() => _products = response.productDetails);
+  }
+
+  void _handlePurchaseUpdates(List<PurchaseDetails> purchases) async {
+    for (var i = 0; i < purchases.length; i++) {
+      if (purchases[i].status == PurchaseStatus.error) {
+        print('Bad purchase status');
+        continue;
+      }
+
+      if (!purchases[i].billingClientPurchase.isAcknowledged) {
+        print('Going to acknowledge purchase ${purchases[i].productID}');
+        await InAppPurchaseConnection.instance.completePurchase(purchases[i]);
+        print('Successfully acknowledged purchase ${purchases[i].productID}');
+      }
+
+      final uid =
+          await Qonversion.manualTrackPurchase(_products[0], purchases[0]);
+      print('Qonversion uid: $uid');
+    }
+  }
+
+  void makePurchase() async {
+    if (_mockTrack) {
+      final uid = await Qonversion.manualTrackPurchase(
+          getProductDetails(), getPurchaseDetails());
+      print(uid);
+      return;
+    }
+    final productDetails = _products[0];
+    final purchaseParam = PurchaseParam(productDetails: productDetails);
+
+    final res = await InAppPurchaseConnection.instance
+        .buyConsumable(purchaseParam: purchaseParam);
+
+    print('Item purchased, result: $res');
+  }
+
   ProductDetails getProductDetails() {
     // ignore: invalid_use_of_visible_for_testing_member
     final original = SkuDetailsWrapper(
       description: 'description',
       freeTrialPeriod: 'freeTrialPeriod',
       introductoryPrice: 'introductoryPrice',
       introductoryPriceMicros: 'introductoryPriceMicros',
-      introductoryPriceCycles: 'introductoryPriceCycles',
+      introductoryPriceCycles: null,
       introductoryPricePeriod: 'introductoryPricePeriod',
       price: 'price',
       priceAmountMicros: 1000,
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -2,8 +2,10 @@ name: qonversion_example
 description: Demonstrates how to use the qonversion plugin.
 publish_to: 'none'
 
+version: 1.0.0
+
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.3.0 <3.0.0"
 
 dependencies:
   flutter:
diff --git a/ios/qonversion_flutter.podspec b/ios/qonversion_flutter.podspec
@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'qonversion_flutter'
-  s.version          = '1.1.1'
+  s.version          = '1.1.2'
   s.summary          = 'Flutter Qonversion SDK'
   s.description      = <<-DESC
   Powerful yet simple subscription analytics
diff --git a/lib/src/constants.dart b/lib/src/constants.dart
@@ -6,6 +6,7 @@ class Constants {
   static const kProvider = 'provider';
   static const kDetails = 'details';
   static const kPurchase = 'purchase';
+  static const kSignature = 'signature';
 
   // MethodChannel methods names
   static const mLaunch = 'launch';
diff --git a/lib/src/qonversion.dart b/lib/src/qonversion.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
@@ -72,12 +73,13 @@ class Qonversion {
     if (!Platform.isAndroid) return null;
 
     final skuDetails = QDetailsSerializer.buildSkuMap(productDetails.skuDetail);
-    final billingClientPurchaseDetails = QDetailsSerializer.buildPurchaseMap(
-        purchaseDetails.billingClientPurchase);
+    final billingClientPurchaseDetails =
+        QDetailsSerializer.buildPurchaseMap(purchaseDetails);
 
     final args = {
-      Constants.kDetails: skuDetails,
-      Constants.kPurchase: billingClientPurchaseDetails,
+      Constants.kDetails: jsonEncode(skuDetails),
+      Constants.kPurchase: jsonEncode(billingClientPurchaseDetails),
+      Constants.kSignature: purchaseDetails.billingClientPurchase.signature,
     };
 
     return _channel.invokeMethod(Constants.mTrackPurchase, args);
diff --git a/lib/src/serializer.dart b/lib/src/serializer.dart
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.qonversion.flutter.sdk.qonversion_flutter_sdk_example`
	`1`	`+package com.qonversion.sample`
`2`	`2`
`3`	`3`	`import androidx.annotation.NonNull;`
`4`	`4`	`import io.flutter.embedding.android.FlutterActivity`