From a820cba8710b2462147057c90e5b7bad35554397 Mon Sep 17 00:00:00 2001
From: Alexander Zatsepin <az@mapswithme.com>
Date: Thu, 6 Sep 2018 13:41:06 +0300
Subject: [PATCH] [android] Added purshase failure callback

---
 .../purchase/PlayStoreBillingCallback.java    |  1 +
 .../purchase/PlayStoreBillingConnection.java  |  3 +++
 .../purchase/PlayStoreBillingManager.java     | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingCallback.java b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingCallback.java
index aaa02e28ff..b075e5c31c 100644
--- a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingCallback.java
+++ b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingCallback.java
@@ -11,4 +11,5 @@ public interface PlayStoreBillingCallback
 {
   void onPurchaseDetailsLoaded(@NonNull List<SkuDetails> details);
   void onPurchaseSuccessful(@NonNull List<Purchase> purchases);
+  void onPurchaseFailure();
 }
diff --git a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingConnection.java b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingConnection.java
index de0166d0ef..0dc1fba9c4 100644
--- a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingConnection.java
+++ b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingConnection.java
@@ -63,6 +63,8 @@ class PlayStoreBillingConnection implements BillingConnection,
     }
 
     mState = State.DISCONNECTED;
+    if (mListener != null)
+      mListener.onDisconnected();
   }
 
   @Override
@@ -75,5 +77,6 @@ class PlayStoreBillingConnection implements BillingConnection,
   interface ConnectionListener
   {
     void onConnected();
+    void onDisconnected();
   }
 }
diff --git a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java
index a5829e93ae..bc33d74125 100644
--- a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java
+++ b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java
@@ -84,6 +84,7 @@ public class PlayStoreBillingManager implements BillingManager<PlayStoreBillingC
         task.run();
         break;
       case DISCONNECTED:
+        mPendingRequests.add(task);
         mConnection.open();
         break;
       case CLOSED:
@@ -137,9 +138,12 @@ public class PlayStoreBillingManager implements BillingManager<PlayStoreBillingC
     if (responseCode != BillingResponse.OK || purchases == null || purchases.isEmpty())
     {
       LOGGER.e(TAG, "Billing failed. Response code: " + responseCode);
+      if (mCallback != null)
+        mCallback.onPurchaseFailure();
       return;
     }
 
+    LOGGER.i(TAG, "Purchase process successful. Count of purchases: " + purchases.size());
     if (mCallback != null)
       mCallback.onPurchaseSuccessful(purchases);
   }
@@ -171,6 +175,17 @@ public class PlayStoreBillingManager implements BillingManager<PlayStoreBillingC
     mPendingRequests.clear();
   }
 
+  @Override
+  public void onDisconnected()
+  {
+    if (mPendingRequests.isEmpty())
+      return;
+
+    mPendingRequests.clear();
+    if (mCallback != null)
+      mCallback.onPurchaseFailure();
+  }
+
   private class QueryProductDetailsRequest implements Runnable
   {
     @Override
@@ -190,12 +205,16 @@ public class PlayStoreBillingManager implements BillingManager<PlayStoreBillingC
       if (responseCode != BillingResponse.OK)
       {
         LOGGER.w(TAG, "Unsuccessful request");
+        if (mCallback != null)
+          mCallback.onPurchaseFailure();
         return;
       }
 
       if (skuDetails == null || skuDetails.isEmpty())
       {
         LOGGER.w(TAG, "Purchase details not found");
+        if (mCallback != null)
+          mCallback.onPurchaseFailure();
         return;
       }