handle unknown checkout info errors

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.14.16]
+
+### Fixed
+- Properly handle unknown checkout info errors
+
 ## [0.14.15]
 
 ### Fixed

build.gradle

@@ -23,7 +23,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.14.15'
+        sdkVersion='0.14.16'
         versionCode=1
 
         compileSdkVersion=28

core/src/main/java/io/snabble/sdk/Checkout.java

@@ -248,7 +248,12 @@ public void noAvailablePaymentMethod() {
             }
 
             @Override
-            public void error() {
+            public void unknownError() {
+                notifyStateChanged(State.CONNECTION_ERROR);
+            }
+
+            @Override
+            public void connectionError() {
                 PaymentMethod fallback = getFallbackPaymentMethod();
                 if(fallback != null) {
                     paymentMethod = fallback;
@@ -448,7 +453,12 @@ public void noAvailablePaymentMethod() {
                     }
 
                     @Override
-                    public void error() {
+                    public void unknownError() {
+
+                    }
+
+                            @Override
+                    public void connectionError() {
 
                     }
                 });

core/src/main/java/io/snabble/sdk/CheckoutApi.java

@@ -159,7 +159,8 @@ public interface CheckoutInfoResult {
         void noShop();
         void invalidProducts(List<Product> products);
         void noAvailablePaymentMethod();
-        void error();
+        void unknownError();
+        void connectionError();
     }
 
     public interface PaymentProcessResult {
@@ -214,7 +215,7 @@ public void createCheckoutInfo(final Shop shop,
         String checkoutUrl = project.getCheckoutUrl();
         if (checkoutUrl == null) {
             Logger.e("Could not checkout, no checkout url provided in metadata");
-            checkoutInfoResult.error();
+            checkoutInfoResult.connectionError();
             return;
         }
 
@@ -257,19 +258,20 @@ public void success(SignedCheckoutInfo signedCheckoutInfo) {
                 if (availablePaymentMethods != null && availablePaymentMethods.length > 0) {
                     checkoutInfoResult.success(signedCheckoutInfo, price, availablePaymentMethods);
                 } else {
-                    checkoutInfoResult.error();
+                    checkoutInfoResult.connectionError();
                 }
             }
 
             @Override
             public void failure(JsonObject obj) {
                 try {
-                    switch (obj.get("error").getAsJsonObject().get("type").getAsString()) {
+                    JsonObject error = obj.get("error").getAsJsonObject();
+                    String type = error.get("type").getAsString();
+
+                    switch (type) {
                         case "invalid_cart_item":
                             List<String> invalidSkus = new ArrayList<>();
-                            JsonArray arr = obj
-                                    .get("error").getAsJsonObject()
-                                    .get("details").getAsJsonArray();
+                            JsonArray arr = error.get("details").getAsJsonArray();
 
                             for (int i=0; i<arr.size(); i++) {
                                 String sku = arr.get(0).getAsJsonObject().get("sku").getAsString();
@@ -295,6 +297,9 @@ public void failure(JsonObject obj) {
                         case "shop_not_found":
                             checkoutInfoResult.noShop();
                             break;
+                        default:
+                            checkoutInfoResult.unknownError();
+                            break;
                     }
                 } catch (Exception e) {
                     error(e);
@@ -304,7 +309,7 @@ public void failure(JsonObject obj) {
             @Override
             public void error(Throwable t) {
                 Logger.e("Error creating checkout info: " + t.getMessage());
-                checkoutInfoResult.error();
+                checkoutInfoResult.connectionError();
             }
         });
     }

core/src/main/java/io/snabble/sdk/ShoppingCartUpdater.java

@@ -48,7 +48,7 @@ public void success(final CheckoutApi.SignedCheckoutInfo signedCheckoutInfo, int
                             public void run() {
                                 // ignore when cart was modified mid request
                                 if (cart.getModCount() != modCount) {
-                                    error();
+                                    unknownError();
                                     return;
                                 }
 
@@ -73,7 +73,7 @@ public void run() {
                                     // error out when items are missing
                                     if (requiredSkus.size() > 0) {
                                         Logger.e("Missing products in price update: " + requiredSkus.toString());
-                                        error();
+                                        unknownError();
                                         return;
                                     }
 
@@ -96,7 +96,7 @@ public void run() {
                                     Logger.d("Successfully updated prices");
                                 } catch (Exception e) {
                                     Logger.e("Could not update price: %s", e.getMessage());
-                                    error();
+                                    unknownError();
                                     return;
                                 }
 
@@ -122,7 +122,12 @@ public void noAvailablePaymentMethod() {
                     }
 
                     @Override
-                    public void error() {
+                    public void unknownError() {
+                        cart.notifyPriceUpdate(cart);
+                    }
+
+                    @Override
+                    public void connectionError() {
                         cart.notifyPriceUpdate(cart);
                     }
                 });