Fixed products with embeddedData == 0 not showing "scanned shelf code"

Author: ajungg

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

@@ -24,6 +24,7 @@ public class ProductResolver {
     private Context context;
     private OnShowListener onShowListener;
     private OnDismissListener onDismissListener;
+    private OnShelfCodeScannedListener onShelfCodeScannedListener;
     private OnProductNotFoundListener onProductNotFoundListener;
     private OnNetworkErrorListener onNetworkErrorListener;
     private BarcodeFormat barcodeFormat;
@@ -127,13 +128,16 @@ private void handleProductAvailable(Product product, boolean wasOnlineProduct, S
         if(product.getBundleProducts().length > 0){
             showBundleDialog(product);
         } else {
-            if (product.getType() == Product.Type.PreWeighed && !scannedCode.hasEmbeddedData()) {
-                Toast.makeText(context,
-                        R.string.Snabble_Scanner_scannedShelfCode,
-                        Toast.LENGTH_LONG)
-                        .show();
+            if (product.getType() == Product.Type.PreWeighed && (!scannedCode.hasEmbeddedData() || scannedCode.getEmbeddedData() == 0)) {
+                if (onShelfCodeScannedListener != null) {
+                    onShelfCodeScannedListener.onShelfCodeScanned();
+                }
 
                 progressDialog.dismiss();
+
+                if (onDismissListener != null) {
+                    onDismissListener.onDismiss();
+                }
             } else {
                 showProduct(product, scannedCode);
 
@@ -220,6 +224,10 @@ public interface OnDismissListener {
         void onDismiss();
     }
 
+    public interface OnShelfCodeScannedListener {
+        void onShelfCodeScanned();
+    }
+
     public interface OnProductNotFoundListener {
         void onProductNotFound();
     }
@@ -265,6 +273,11 @@ public Builder setOnNetworkErrorListener(OnNetworkErrorListener listener) {
             return this;
         }
 
+        public Builder setOnShelfCodeScannedListener(OnShelfCodeScannedListener listener) {
+            productResolver.onShelfCodeScannedListener  = listener;
+            return this;
+        }
+
         public ProductResolver create() {
             return productResolver;
         }

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

@@ -27,7 +27,6 @@
 
 import io.snabble.sdk.BarcodeFormat;
 import io.snabble.sdk.Checkout;
-import io.snabble.sdk.OnProductAvailableListener;
 import io.snabble.sdk.Product;
 import io.snabble.sdk.ProductDatabase;
 import io.snabble.sdk.Project;
@@ -40,7 +39,6 @@
 import io.snabble.sdk.ui.telemetry.Telemetry;
 import io.snabble.sdk.ui.utils.DelayedProgressDialog;
 import io.snabble.sdk.ui.utils.UIUtils;
-import io.snabble.sdk.utils.IntRange;
 import io.snabble.sdk.utils.SimpleActivityLifecycleCallbacks;
 import io.snabble.sdk.utils.Utils;
 
@@ -181,6 +179,12 @@ public void onNetworkError() {
                         showInfo(R.string.Snabble_Scanner_networkError);
                     }
                 })
+                .setOnShelfCodeScannedListener(new ProductResolver.OnShelfCodeScannedListener() {
+                    @Override
+                    public void onShelfCodeScanned() {
+                        showInfo(R.string.Snabble_Scanner_scannedShelfCode);
+                    }
+                })
                 .create()
                 .show();
     }