allow scanning of user weighed products with pre weighed barcodes

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.44.4]
+
+### Fixed
+- Handle edge case when scanning a user weighed product with a pre weighed barcode
+
 ## [0.44.3]
 
 ### Fixed 

build.gradle

@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.44.3'
+        sdkVersion='0.44.4'
         versionCode=1
 
         compileSdkVersion=30

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

@@ -317,7 +317,7 @@ public void addToCart() {
 
         Telemetry.event(Telemetry.Event.ConfirmedProduct, cartItem.getProduct());
 
-        int q = getQuantity();
+        int q = Math.max(getQuantity(), cartItem.getScannedCode().getEmbeddedData());
         if (cartItem.getProduct().getType() == Product.Type.UserWeighed && q == 0) {
             shake();
             return;
@@ -327,7 +327,9 @@ public void addToCart() {
             shoppingCart.add(cartItem);
         }
 
-        cartItem.setQuantity(q);
+        if (cartItem.getProduct().getType() == Product.Type.UserWeighed) {
+            cartItem.setQuantity(q);
+        }
 
         shoppingCart.updatePrices(false);