From 68255c195b5a9bb67e766647decc9a5d173fe9c3 Mon Sep 17 00:00:00 2001
From: Tolriq <tolriq@tolriq.com>
Date: Fri, 6 Jun 2014 11:16:30 +0200
Subject: [PATCH] Fix known errors from Stackoverflow and users experiences

---
 .../oms/appstore/googleUtils/IabHelper.java   | 39 ++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/library/src/org/onepf/oms/appstore/googleUtils/IabHelper.java b/library/src/org/onepf/oms/appstore/googleUtils/IabHelper.java
index df1b142f..3c25cf6b 100644
--- a/library/src/org/onepf/oms/appstore/googleUtils/IabHelper.java
+++ b/library/src/org/onepf/oms/appstore/googleUtils/IabHelper.java
@@ -598,6 +598,8 @@ public Inventory queryInventory(boolean querySkuDetails, List<String> moreItemSk
             throw new IabException(IABHELPER_REMOTE_EXCEPTION, "Remote exception while refreshing inventory.", e);
         } catch (JSONException e) {
             throw new IabException(IABHELPER_BAD_RESPONSE, "Error parsing JSON response while refreshing inventory.", e);
+        } catch (Exception e) {
+            throw new IabException(IABHELPER_UNKNOWN_ERROR, "Exception while refreshing inventory.", e);
         }
     }
 
@@ -639,17 +641,31 @@ public void run() {
                     inv = queryInventory(querySkuDetails, moreSkus);
                 } catch (IabException ex) {
                     result = ex.getResult();
+                } catch (NullPointerException e) {
+                    // Ignore errors if disposed during async operations
+                    if (mSetupDone) {
+                        flagEndAsync();
+                        throw e;
+                    }
+                } catch (IllegalStateException e) {
+                    // Ignore errors if disposed during async operations
+                    if (mSetupDone) {
+                        flagEndAsync();
+                        throw e;
+                    }
                 }
 
                 flagEndAsync();
 
                 final IabResult result_f = result;
                 final Inventory inv_f = inv;
-                handler.post(new Runnable() {
-                    public void run() {
-                        listener.onQueryInventoryFinished(result_f, inv_f);
-                    }
-                });
+                if (mSetupDone && listener != null) {
+                    handler.post(new Runnable() {
+                        public void run() {
+                            listener.onQueryInventoryFinished(result_f, inv_f);
+                        }
+                    });
+                }
             }
         })).start();
     }
@@ -828,6 +844,11 @@ void checkSetupDone(String operation) {
 
     // Workaround to bug where sometimes response codes come as Long instead of Integer
     int getResponseCodeFromBundle(Bundle b) {
+
+        if (b == null) {
+            return BILLING_RESPONSE_RESULT_ERROR;
+        }
+
         Object o = b.get(RESPONSE_CODE);
         if (o == null) {
             logDebug("Bundle with null response code, assuming OK (known issue)");
@@ -843,7 +864,7 @@ int getResponseCodeFromBundle(Bundle b) {
 
     // Workaround to bug where sometimes response codes come as Long instead of Integer
     int getResponseCodeFromIntent(Intent i) {
-        Object o = i.getExtras().get(RESPONSE_CODE);
+        Object o = (i.getExtras() != null) ? i.getExtras().get(RESPONSE_CODE) : null;
         if (o == null) {
             logError("Intent with no response code, assuming OK (known issue)");
             return BILLING_RESPONSE_RESULT_OK;
@@ -880,7 +901,7 @@ int queryPurchases(Inventory inv, String itemType) throws JSONException, RemoteE
 
         do {
             logDebug("Calling getPurchases with continuation token: " + continueToken);
-            if(mService==null){
+            if (mService == null){
                 logDebug("getPurchases() failed: service is not connected.");
                 return BILLING_RESPONSE_RESULT_ERROR;
             }
@@ -1023,14 +1044,14 @@ public void run() {
                 }
 
                 flagEndAsync();
-                if (singleListener != null) {
+                if (mSetupDone && singleListener != null) {
                     handler.post(new Runnable() {
                         public void run() {
                             singleListener.onConsumeFinished(purchases.get(0), results.get(0));
                         }
                     });
                 }
-                if (multiListener != null) {
+                if (mSetupDone && multiListener != null) {
                     handler.post(new Runnable() {
                         public void run() {
                             multiListener.onConsumeMultiFinished(purchases, results);