price updates & always show local price

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.11.2]
+
+### Fixed
+- Prices are now updated when updating the ProductDatabase
+- Always show the locally calculated price for consistency
+
 ## [0.11.1]
 
 ### Fixed

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

@@ -202,7 +202,7 @@ public void success(CheckoutApi.SignedCheckoutInfo checkoutInfo,
                                 int onlinePrice,
                                 PaymentMethod[] availablePaymentMethods) {
                 signedCheckoutInfo = checkoutInfo;
-                priceToPay = onlinePrice;
+                priceToPay = shoppingCart.getTotalPrice();
 
                 if (availablePaymentMethods.length == 1 && !availablePaymentMethods[0].isRequiringCredentials()) {
                     pay(availablePaymentMethods[0], null, true);
@@ -394,7 +394,7 @@ public void run() {
                     public void success(CheckoutApi.SignedCheckoutInfo signedCheckoutInfo,
                                         int onlinePrice,
                                         PaymentMethod[] availablePaymentMethods) {
-                        priceToPay = onlinePrice;
+                        priceToPay = shoppingCart.getTotalPrice();
 
                         checkoutApi.createPaymentProcess(signedCheckoutInfo, pm, null,
                                 new CheckoutApi.PaymentProcessResult() {

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

@@ -550,29 +550,30 @@ public void update(final UpdateCallback callback, boolean deltaUpdateOnly) {
         productDatabaseDownloader.update(new Downloader.Callback() {
             @Override
             protected void onDataLoaded(boolean wasStillValid) {
-                updateLastUpdateTimestamp(System.currentTimeMillis());
-                notifyOnDatabaseUpdated();
-
-                if (callback != null) {
-                    callback.success();
-                }
+                update();
             }
 
             @Override
             protected void onError() {
                 if (productDatabaseDownloader.wasSameRevision()) {
-                    updateLastUpdateTimestamp(System.currentTimeMillis());
-                    notifyOnDatabaseUpdated();
-
-                    if (callback != null) {
-                        callback.success();
-                    }
+                    update();
                 } else {
                     if (callback != null) {
                         callback.error();
                     }
                 }
             }
+
+            private void update() {
+                updateLastUpdateTimestamp(System.currentTimeMillis());
+                notifyOnDatabaseUpdated();
+
+                if (callback != null) {
+                    callback.success();
+                }
+
+                project.getShoppingCart().update();
+            }
         }, deltaUpdateOnly);
     }
 

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

@@ -277,6 +277,22 @@ public void invalidate() {
         clear();
     }
 
+    public void update() {
+        ProductDatabase productDatabase = project.getProductDatabase();
+
+        if (productDatabase.isUpToDate()) {
+            for (Entry e : items) {
+                Product product = productDatabase.findByCode(e.scannedCode);
+
+                if (product != null) {
+                    e.product = product;
+                }
+            }
+
+            notifyUpdate(this);
+        }
+    }
+
     public void checkForTimeout() {
         long currentTime = System.currentTimeMillis();
 
@@ -504,11 +520,18 @@ public interface ShoppingCartListener {
         void onItemMoved(ShoppingCart list, int fromIndex, int toIndex);
 
         void onItemRemoved(ShoppingCart list, Product product);
+
+        void onUpdate(ShoppingCart list);
     }
 
     public static abstract class SimpleShoppingCartListener implements ShoppingCartListener {
         public abstract void onChanged(ShoppingCart list);
 
+        @Override
+        public void onUpdate(ShoppingCart list) {
+            onChanged(list);
+        }
+
         @Override
         public void onItemAdded(ShoppingCart list, Product product) {
             onChanged(list);
@@ -587,6 +610,16 @@ public void run() {
         });
     }
 
+    private void notifyUpdate(final ShoppingCart list) {
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                for (ShoppingCartListener listener : listeners) {
+                    listener.onUpdate(list);
+                }
+            }
+        });
+    }
     /**
      * Notifies all {@link #listeners} that the shopping list was cleared of all entries.
      *

ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java

@@ -88,6 +88,11 @@ public void onItemMoved(ShoppingCart list, int fromIndex, int toIndex) {
         public void onItemRemoved(ShoppingCart list, Product product) {
 
         }
+
+        @Override
+        public void onUpdate(ShoppingCart list) {
+            onCartUpdated();
+        }
     };
 
     public ShoppingCartView(Context context) {

ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java

@@ -411,6 +411,11 @@ public void onItemMoved(ShoppingCart list, int fromIndex, int toIndex) {
         public void onItemRemoved(ShoppingCart list, Product product) {
 
         }
+
+        @Override
+        public void onUpdate(ShoppingCart list) {
+
+        }
     };
 
     private Application.ActivityLifecycleCallbacks activityLifecycleCallbacks =