Merge pull request livecode#6896 from livecodepanos/bugfix-21880

livecodepanos · web-flow · commit 3dd9687487c1 · 2019-03-27T22:43:30.000+02:00
[21880] Prevent crash when restoring IAP but Google Billing Service is disconnected
diff --git a/docs/notes/bugfix-21880.md b/docs/notes/bugfix-21880.md
@@ -0,0 +1 @@
+# Prevent crash when restoring in-app-purchases but the Billing Service is disconnected
diff --git a/engine/src/java/com/runrev/android/billing/google/IabHelper.java b/engine/src/java/com/runrev/android/billing/google/IabHelper.java
@@ -129,6 +129,7 @@ public class IabHelper {
     public static final int IABHELPER_UNKNOWN_ERROR = -1008;
     public static final int IABHELPER_SUBSCRIPTIONS_NOT_AVAILABLE = -1009;
     public static final int IABHELPER_INVALID_CONSUMPTION = -1010;
+    public static final int IABHELPER_SERVICE_IS_NULL = -1011;
     
     // Keys for the responses from InAppBillingService
     public static final String RESPONSE_CODE = "RESPONSE_CODE";
@@ -788,7 +789,6 @@ else if (code < 0 || code >= iab_msgs.length)
             return iab_msgs[code];
     }
     
-    
     // Checks that setup was done; if not, throws an exception.
     void checkSetupDone(String operation) {
         if (!mSetupDone) {
@@ -851,6 +851,9 @@ int queryPurchases(Inventory inv, String itemType) throws JSONException, RemoteE
         boolean verificationFailed = false;
         String continueToken = null;
         
+        if (mService == null)
+            return serviceIsDisconnected("queryPurchases");
+        
         do {
             logDebug("Calling getPurchases with continuation token: " + continueToken);
             Bundle ownedItems = mService.getPurchases(3, mContext.getPackageName(),
@@ -910,6 +913,8 @@ int queryPurchases(Inventory inv, String itemType) throws JSONException, RemoteE
     int querySkuDetails(String itemType, Inventory inv, List<String> moreSkus)
     throws RemoteException, JSONException {
         logDebug("Querying SKU details.");
+        if (mService == null)
+            return serviceIsDisconnected("querySkuDetails");
         ArrayList<String> skuList = new ArrayList<String>();
         skuList.addAll(inv.getAllOwnedSkus(itemType));
         if (moreSkus != null) {
@@ -1028,4 +1033,9 @@ void logError(String msg) {
     void logWarn(String msg) {
         Log.w(mDebugTag, "In-app billing warning: " + msg);
     }
-}
+    
+    private int serviceIsDisconnected(String operation) {
+        logError("IabHelper.mService is null. Service not connected: " + operation);
+        return IABHELPER_SERVICE_IS_NULL;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Prevent crash when restoring in-app-purchases but the Billing Service is disconnected`