Handle metadata flag verifyInternalEanChecksum

Author: ajungg

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

@@ -12,6 +12,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import io.snabble.sdk.utils.JsonUtils;
 import io.snabble.sdk.utils.Logger;
 import io.snabble.sdk.utils.StringDownloader;
 
@@ -25,6 +26,7 @@ class MetadataDownloader extends StringDownloader {
 
     private boolean hasData = false;
     private RoundingMode roundingMode;
+    private boolean verifyInternalEanChecksum;
 
     public MetadataDownloader(SnabbleSdk sdk,
                               String bundledFileAssetPath) {
@@ -72,6 +74,7 @@ protected void onDownloadFinished(String content) {
             if (jsonObject.has("project")) {
                 this.project = jsonObject.get("project").getAsJsonObject();
                 this.roundingMode = parseRoundingMode(project.get("roundingMode"));
+                this.verifyInternalEanChecksum = JsonUtils.getBooleanOpt(project, "verifyInternalEanChecksum", true);
             }
 
             this.urls = Collections.unmodifiableMap(urls);
@@ -125,4 +128,8 @@ public JsonObject getProject() {
     public RoundingMode getRoundingMode() {
         return roundingMode;
     }
+
+    public boolean isVerifyingInternalEanChecksum() {
+        return verifyInternalEanChecksum;
+    }
 }

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

@@ -590,6 +590,10 @@ public RoundingMode getRoundingMode() {
         return metadataDownloader.getRoundingMode();
     }
 
+    public boolean isVerifyingInternalEanChecksum() {
+        return metadataDownloader.isVerifyingInternalEanChecksum();
+    }
+
     public Checkout getCheckout() {
         return checkout;
     }

core/src/main/java/io/snabble/sdk/codes/EAN13.java

@@ -4,35 +4,41 @@
 
 import java.io.Serializable;
 
+import io.snabble.sdk.SnabbleSdk;
+
 public class EAN13 extends ScannableCode implements Serializable {
     private String lookupCode;
     private int embeddedData;
-    private boolean hasAmountData;
+    private boolean hasUnitData;
     private boolean hasPriceData;
     private boolean hasWeighData;
 
-    public EAN13(String code, String[] weighPrefixes, String[] pricePrefixes, String[] amountPrefixes) {
+    private boolean verifyInternalEanChecksum;
+
+    EAN13(String code, SnabbleSdk snabbleSdk) {
         super(code);
 
         if(!isEan13(code)){
             throw new IllegalArgumentException("Not a valid EAN13 code");
         }
 
-        for (String prefix : weighPrefixes) {
+        verifyInternalEanChecksum = snabbleSdk.isVerifyingInternalEanChecksum();
+
+        for (String prefix : snabbleSdk.getWeighPrefixes()) {
             if (code.startsWith(prefix)) {
                 hasWeighData = true;
             }
         }
 
-        for (String prefix : pricePrefixes) {
+        for (String prefix : snabbleSdk.getPricePrefixes()) {
             if (code.startsWith(prefix)) {
                 hasPriceData = true;
             }
         }
 
-        for (String prefix : amountPrefixes) {
+        for (String prefix : snabbleSdk.getUnitPrefixes()) {
             if (code.startsWith(prefix)) {
-                hasAmountData = true;
+                hasUnitData = true;
             }
         }
 
@@ -42,7 +48,7 @@ public EAN13(String code, String[] weighPrefixes, String[] pricePrefixes, String
         } else {
             lookupCode = code;
             hasWeighData = false;
-            hasAmountData = false;
+            hasUnitData = false;
             hasPriceData = false;
         }
     }
@@ -59,7 +65,7 @@ public int getEmbeddedData() {
 
     @Override
     public boolean hasAmountData() {
-        return hasAmountData;
+        return hasUnitData;
     }
 
     @Override
@@ -74,7 +80,7 @@ public boolean hasWeighData() {
 
     @Override
     public boolean hasEmbeddedData(){
-        return hasAmountData || hasPriceData || hasWeighData;
+        return hasUnitData || hasPriceData || hasWeighData;
     }
 
     @Override
@@ -83,6 +89,10 @@ public boolean isEmbeddedDataOk() {
             return false;
         }
 
+        if(!verifyInternalEanChecksum){
+            return true;
+        }
+
         String code = getCode();
         int digit = Character.digit(code.charAt(6), 10);
         int check = internalChecksum(code);

core/src/main/java/io/snabble/sdk/codes/ScannableCode.java

@@ -45,10 +45,7 @@ public boolean isEmbeddedDataOk() {
 
     public static ScannableCode parse(SnabbleSdk snabbleSdk, String code){
         if(EAN13.isEan13(code)){
-            return new EAN13(code,
-                    snabbleSdk.getWeighPrefixes(),
-                    snabbleSdk.getPricePrefixes(),
-                    snabbleSdk.getUnitPrefixes());
+            return new EAN13(code, snabbleSdk);
         } else {
             return new ScannableCode(code);
         }