allow instant consuming of IAP for test purposes. fix purchaseWithReceipt call. now returns a Purchse object

Author: cchierici

android/src/main/java/com/lykhonis/flutterbilling/BillingPlugin.java

@@ -15,10 +15,13 @@
 import com.android.billingclient.api.SkuDetails;
 import com.android.billingclient.api.SkuDetailsParams;
 import com.android.billingclient.api.SkuDetailsResponseListener;
+import com.android.billingclient.api.ConsumeResponseListener;
+
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -34,6 +37,7 @@ public final class BillingPlugin implements MethodCallHandler {
     private final Activity activity;
     private final BillingClient billingClient;
     private final Map<String, Result> pendingPurchaseRequests;
+    private final Map<String, Boolean> requestsToConsume;
 
     private boolean billingServiceConnected;
 
@@ -46,6 +50,7 @@ private BillingPlugin(Activity activity) {
         this.activity = activity;
 
         pendingPurchaseRequests = new HashMap<>();
+        requestsToConsume = new HashMap<>();
 
         billingClient = BillingClient.newBuilder(activity)
                                      .setListener(new BillingListener())
@@ -87,8 +92,11 @@ public void onMethodCall(MethodCall methodCall, Result result) {
         } else if ("fetchPurchases".equals(methodCall.method)) {
             fetchPurchases(result);
         } else if ("purchase".equals(methodCall.method)) {
-            purchase(methodCall.<String>argument("identifier"), result);
-        } else if ("fetchSubscriptions".equals(methodCall.method)) {
+            purchase(
+                methodCall.<String>argument("identifier"),
+                methodCall.<Boolean>argument("consume"),
+                result);
+        }  else if ("fetchSubscriptions".equals(methodCall.method)) {
             fetchSubscriptions(result);
         } else if ("subscribe".equals(methodCall.method)) {
             subscribe(methodCall.<String>argument("identifier"), result);
@@ -153,7 +161,10 @@ public void failed() {
         });
     }
 
-    private void purchase(final String identifier, final Result result) {
+    private void purchase(final String identifier, final Boolean consume, final Result result) {
+
+        requestsToConsume.put(identifier, consume);
+
         executeServiceRequest(new Request() {
             @Override
             public void execute() {
@@ -165,6 +176,7 @@ public void execute() {
                                          .build());
 
                 if (responseCode == BillingResponse.OK) {
+                    Log.d(TAG, "purchase(): result: " + result.toString());
                     pendingPurchaseRequests.put(identifier, result);
                 } else {
                     result.error("ERROR", "Failed to launch billing flow to purchase an item with error " + responseCode, null);
@@ -259,7 +271,7 @@ static Map<String, Object> convertSkuDetailToMap(SkuDetails detail) {
         return product;
     }
 
-    List<Map<String, Object>> convertPurchasesToListOfMaps(List<Purchase> purchases) {
+    private List<Map<String, Object>> convertPurchasesToListOfMaps(List<Purchase> purchases) {
         if (purchases == null) {
             return Collections.emptyList();
         }
@@ -271,7 +283,7 @@ List<Map<String, Object>> convertPurchasesToListOfMaps(List<Purchase> purchases)
         return list;
     }
 
-    static Map<String, Object> convertPurchaseToMap(Purchase purchase) {
+    private static Map<String, Object> convertPurchaseToMap(Purchase purchase) {
         final Map<String, Object> product = new HashMap<>();
         product.put("orderId", purchase.getOrderId());
         product.put("packageName", purchase.getPackageName());
@@ -325,11 +337,34 @@ private void executeServiceRequest(Request request) {
     }
 
     final class BillingListener implements PurchasesUpdatedListener {
+
         @Override
         public void onPurchasesUpdated(int resultCode, List<Purchase> purchases) {
+
+            if (purchases != null) {
+                Log.d(TAG, "onPurchasesUpdated(): num: " + purchases.size());
+
+                for (Purchase p : purchases) {
+                    Boolean consume = requestsToConsume.remove(p.getSku());
+                    if (consume != null && consume == true) {
+                        Log.d("BillingPlugin", "onPurchasesUpdated(): consuming. token " + p.getPurchaseToken());
+
+                        billingClient.consumeAsync(p.getPurchaseToken(), new ConsumeResponseListener() {
+                            @Override
+                            public void onConsumeResponse(int responseCode, String purchaseToken) {
+                                Log.d("BillingPlugin", "onConsumeResponse(): consumed: " + purchaseToken);
+                            }
+                        });
+                    }
+                }
+            }
+
             if (resultCode == BillingResponse.OK && purchases != null) {
+
                 final List<Map<String, Object>> identifiers = convertPurchasesToListOfMaps(purchases);
                 for (final Map<String, Object> next : identifiers) {
+                    Log.d("BillingPlugin", "onPurchasesUpdated(): id: " + next);
+
                     final Result result = pendingPurchaseRequests.remove(next.get("identifier"));
                     if (result != null) {
                         result.success(identifiers);

lib/flutter_billing.dart

@@ -95,7 +95,7 @@ class Purchase {
   @override
   String toString() {
     return 'Purchase{order: $orderId, package: $packageName, sku: $identifier,  '
-        'token: $purchaseToken, purchaseTime: $purchaseTime, expiresTime: $expiresTime, autorenewal: $autorenewal';
+        'purchaseToken: $purchaseToken, purchaseTime: $purchaseTime, expiresTime: $expiresTime, autorenewal: $autorenewal';
   }
 }
 
@@ -158,7 +158,10 @@ class Billing {
   ///
   /// Returns products identifiers that are already purchased.
   Future<Set<Purchase>> getPurchases() {
+    print("FLUTTER_BILLING: getPurchases():");
+
     if (_purchasesFetched) {
+      print("FLUTTER_BILLING: getPurchases(): already fetched");
       return new Future.value(new Set.from(_purchasedProducts));
     }
     return synchronized(this, () async {
@@ -167,6 +170,7 @@ class Billing {
         key: (purchase) => purchase['orderId'],
         value: (purchase) => _convertToPurchase(purchase),
       );
+      print("FLUTTER_BILLING: getPurchases(): fetched: ${purchases.values.length} products");
       _purchasedProducts.addAll(purchases.values);
       _purchasesFetched = true;
       return _purchasedProducts;
@@ -176,29 +180,43 @@ class Billing {
   /// Validate if a product is purchased.
   ///
   /// Returns true if a product is purchased, otherwise false.
+  ///
   Future<bool> isPurchased(String identifier) async {
     assert(identifier != null);
     final Set<Purchase> purchases = await getPurchases();
     return purchases.where((Purchase purchase) => purchase.identifier == identifier).isNotEmpty;
   }
 
+  /// Validate if a product is purchased.
+  ///
+  /// Returns a [Purchase] if a product is purchased, otherwise null.
+  ///
+  Future<Purchase> getPurchase(String identifier) async {
+    assert(identifier != null);
+    final Set<Purchase> purchases = await getPurchases();
+    return purchases.where((Purchase purchase) => purchase.identifier == identifier).first;
+  }
+
   /// Purchase a product.
   /// [identifier] id of the product to purchase.
   /// [appSharedSecret] Apples app shared secret. Only for Apple, ignored for Android.
   ///
   /// This would trigger platform UI to walk a user through steps of purchasing the product.
   /// Returns updated list of product identifiers that have been purchased.
-  Future<bool> purchase(String identifier) async {
+  Future<bool> purchase(String identifier, bool consume) async {
     assert(identifier != null);
 
+    print("FLUTTER_BILLING: purchase(): id: ${identifier}");
+
     final bool purchased = await isPurchased(identifier);
     if (purchased) {
+      print("FLUTTER_BILLING: purchase(): id: ${identifier} already purchased");
       return new Future.value(true);
     }
 
     return synchronized(this, () async {
       final Map<String, Purchase> purchases = new Map.fromIterable(
-        await _channel.invokeMethod('purchase', {'identifier': identifier}),
+        await _channel.invokeMethod('purchase', {'identifier': identifier, 'consume': consume}),
         key: (purchase) => purchase['orderId'],
         value: (purchase) => _convertToPurchase(purchase),
       );
@@ -211,32 +229,29 @@ class Billing {
 
   /// Purchase a product. And retrieve the receipt.
   /// Use this when you need the receipt data to do serverside validation
-  Future<Purchase> purchaseWithReceipt(String identifier) async {
+  /// 
+  Future<Purchase> purchaseWithReceipt(String identifier, bool consume) async {
     assert(identifier != null);
 
-    print("FLUTTER_BILLIING: purchaseWithReceipt(): productId: $identifier");
+    print("FLUTTER_BILLING: purchaseWithReceipt(): productId: $identifier");
 
     final bool purchased = await isPurchased(identifier);
+    
     if (purchased) {
-      print("FLUTTER_BILLIING: purchaseWithReceipt(): already puchased");
-      // return new Future.value(null);
+      print("FLUTTER_BILLING: purchaseWithReceipt(): already puchased");
+      //return new Future.value(null);
     }
 
     return synchronized(this, () async {
       final Map<String, Purchase> purchases = new Map.fromIterable(
-        await _channel.invokeMethod('purchase', {'identifier': identifier}),
-        key: (purchase) => purchase['orderId'],
+        await _channel.invokeMethod('purchase', {'identifier': identifier, 'consume': consume}),
+        key: (purchase) => purchase['identifier'],
         value: (purchase) => _convertToPurchase(purchase),
       );
-
-      purchases.forEach((k,v) {
-        if (k == identifier) {
-          print("FLUTTER_BILLIING: purchaseWithReceipt(): got receipt");
-          return v;
-        }
-      });
-      // Something went wrong
-      return null;
+      _purchasedProducts.addAll(purchases.values);
+      _purchasesFetched = true;
+      final Purchase purchase = await getPurchase(identifier);
+      return purchase;
     });
   }
 
@@ -322,10 +337,12 @@ BillingProduct _convertToBillingProduct(Map<dynamic, dynamic> product) {
 }
 
 Purchase _convertToPurchase(Map<dynamic, dynamic> purchase) {
+  print("_convertToPurchase(): $purchase");
   assert(purchase != null);
   final num purchaseTime = purchase['purchaseTime'];
   final num expiresTime = purchase['expiresTime'];
-  return new Purchase(
+
+  Purchase ret = new Purchase(
     orderId: purchase['orderId'],
     packageName: purchase['packageName'],
     identifier: purchase['identifier'],
@@ -334,4 +351,8 @@ Purchase _convertToPurchase(Map<dynamic, dynamic> purchase) {
     expiresTime: expiresTime?.toInt() ?? 0,
     autorenewal: purchase['autorenewal'],
   );
+
+  print("_convertToPurchase(): $ret");
+
+  return ret;
 }