added support for treating shorter scannable codes as ean 13

Author: ajungg

core/src/androidTest/assets/demoDb_1_6.sqlite3

@@ -1,7 +1,6 @@
 package io.snabble.sdk;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import io.snabble.sdk.codes.EAN13;

core/src/androidTest/java/io/snabble/sdk/EAN13Test.java

@@ -7,6 +7,8 @@
 import android.support.test.runner.AndroidJUnit4;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -340,4 +342,34 @@ public void testFullUpdateDoesNotModifyOnWrongMajorVersion() throws IOException
         product = productDatabase.findBySku("1");
         assertEquals(name, product.getName());
     }
+
+    @Test
+    public void testFindProductWithByEan8WhenScanningEan13() throws IOException, Snabble.SnabbleException {
+        setupSdkWithDb("demoDb_1_6.sqlite3");
+
+        ProductDatabase productDatabase = project.getProductDatabase();
+        Product product = productDatabase.findByCode("42276630");
+        Assert.assertNotNull(product);
+
+        String[] codes = product.getScannableCodes();
+        Assert.assertTrue(ArrayUtils.contains(codes, "42276630"));
+
+        Product product2 = productDatabase.findByCode("0000042276630");
+        Assert.assertNotNull(product2);
+
+        String[] codes2 = product2.getScannableCodes();
+        Assert.assertTrue(ArrayUtils.contains(codes2, "42276630"));
+    }
+
+    @Test
+    public void testFindProductWithEan13ByEan8() throws IOException, Snabble.SnabbleException {
+        setupSdkWithDb("demoDb_1_6.sqlite3");
+
+        ProductDatabase productDatabase = project.getProductDatabase();
+        Product product = productDatabase.findByCode("40084015");
+        Assert.assertNotNull(product);
+
+        String[] codes = product.getScannableCodes();
+        Assert.assertTrue(ArrayUtils.contains(codes, "0000040084015"));
+    }
  }

core/src/androidTest/java/io/snabble/sdk/ProductDatabaseTest.java

@@ -18,7 +18,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -44,7 +44,7 @@ public static void setupMockWebServer() throws Exception {
         mockWebServer = new MockWebServer();
         mockWebServer.start();
 
-        final String metadataJson = IOUtils.toString(context.getAssets().open("metadata.json"), StandardCharsets.UTF_8);
+        final String metadataJson = IOUtils.toString(context.getAssets().open("metadata.json"), Charset.forName("UTF-8"));
 
         final Buffer product1Buffer = new Buffer();
         product1Buffer.readFrom(context.getAssets().open("product.json"));

core/src/androidTest/java/io/snabble/sdk/SnabbleSdkTest.java

@@ -16,6 +16,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -1033,6 +1034,10 @@ public Product[] findBySkus(String... skus) {
      * @return The first product containing the given EAN, otherwise null if no product was found.
      */
     public Product findByCode(String code) {
+        return findByCodeInternal(code, true);
+    }
+
+    private Product findByCodeInternal(String code, boolean recursive) {
         if (code == null || code.length() == 0) {
             return null;
         }
@@ -1046,11 +1051,16 @@ public Product findByCode(String code) {
 
         if (p != null) {
             return p;
-        } else if (code.startsWith("0")){
-            return findByCode(code.substring(1, code.length()));
-        } else {
-            return null;
+        } else if (recursive) {
+            if (code.startsWith("0")){
+                return findByCodeInternal(code.substring(1, code.length()), true);
+            } else if (code.length() >= 8 && code.length() < 13) {
+                String newCode = StringUtils.repeat('0', 13 - code.length()) + code;
+                return findByCodeInternal(newCode, false);
+            }
         }
+
+        return null;
     }
 
     /**