Merge pull request #2 from arashmilani/master

bugfix: App crashing when user not logged in Cafebazaar.

Author: Omid Golshan

android/app/src/main/java/com/contoriel/cafebazaar/CafeBazaar.java

@@ -124,10 +124,11 @@ public void onQueryInventoryFinished(IabResult result, Inventory inventory) {
               promise.reject(E_SETUP_DISCONNECT,"there no connection to cafe bazaar!");
             }
             // Is it a failure?
-            if (result.isFailure()) {
+            else if (result.isFailure()) {
               promise.reject(E_LAYOUT_ERROR,"Failed to query inventory: " + result.getMessage());
-            }
+            } else {
               promise.resolve(gson.toJson(inventory));
+            }
         }
     });
   }
@@ -142,11 +143,12 @@ public void onQueryInventoryFinished(IabResult result, Inventory inventory) {
               promise.reject(E_SETUP_DISCONNECT,"there no connection to cafe bazaar!");
             }
             // Is it a failure?
-            if (result.isFailure()) {
+            else if (result.isFailure()) {
               promise.reject(E_LOAD_ITEMS_FAILURE,result.getMessage());
+            } else {
+              userInvo = inventory;
+              promise.resolve(gson.toJson(inventory.getAllOwnedSkus()));
             }
-            userInvo = inventory;
-            promise.resolve(gson.toJson(inventory.getAllOwnedSkus()));
         }
     });
   }

android/app/src/main/java/com/contoriel/cafebazaar/util/IabHelper.java

@@ -289,7 +289,7 @@ public void dispose() {
         mSetupDone = false;
         if (mServiceConn != null) {
             logDebug("Unbinding from service.");
-            if (mContext != null) mContext.unbindService(mServiceConn);
+            if (mContext != null && mService != null) mContext.unbindService(mServiceConn);
         }
         mDisposed = true;
         mContext = null;

package.json

@@ -89,5 +89,5 @@
     "start": "node node_modules/react-native/local-cli/cli.js start",
     "test": "jest"
   },
-  "version": "1.0.0"
+  "version": "1.0.1"
 }