Merge pull request #120 from AndreiMisiukevich/issue111_fix

fix #111
jamesmontemagno · Feb 21, 2018 · 1de6b2d · 1de6b2d
2 parents aa6f418 + cddcd12
commit 1de6b2d
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/Plugin.InAppBilling.Android/InAppBillingImplementation.cs b/src/Plugin.InAppBilling.Android/InAppBillingImplementation.cs
@@ -504,7 +504,18 @@ public async override Task<InAppBillingPurchase> ConsumePurchaseAsync(string pro
         public static void HandleActivityResult(int requestCode, Result resultCode, Intent data)
         {
 
-            if (PURCHASE_REQUEST_CODE != requestCode || data == null)
+            if (PURCHASE_REQUEST_CODE != requestCode)
+            {
+                return;
+            }
+
+            if(resultCode == Result.Canceled && tcsPurchase != null && !tcsPurchase.Task.IsCompleted)
+            {
+                tcsPurchase.SetException(new InAppBillingPurchaseException(PurchaseError.UserCancelled));
+                return;
+            }
+
+            if(data == null)
             {
                 return;
             }