add support for indexed prefixes in encoded codes

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.13.10]
+
+### Fixed
+- Prevent repeating of customer card ids in encoded codes
+
 ## [0.13.9]
 
 ### Fixed
@@ -14,13 +19,13 @@ All notable changes to this project will be documented in this file.
 ## [0.13.7]
 
 ### Fixed
-- Handle missing customer card id in encodedCodesIKEA
+- Handle missing customer card id in encodedCodes
 
 ## [0.13.6]
 
 ### Added
 - Support for maximum size of encoded code qr code display
-- Support for encodedCodesIKEA payment method
+- Support for additional payment methods
 
 ### Fixed
 - Race condition when updating product database and shopping cart prices at the same time

core/src/main/java/io/snabble/sdk/encodedcodes/EncodedCodesGenerator.java

@@ -258,7 +258,7 @@ private void append(String code) {
         }
 
         if (stringBuilder.length() == 0) {
-            stringBuilder.append(options.prefix);
+            stringBuilder.append(options.prefixMap.get(encodedCodes.size(), options.prefix));
         } else {
             stringBuilder.append(options.separator);
         }

core/src/main/java/io/snabble/sdk/encodedcodes/EncodedCodesOptions.java

@@ -1,9 +1,12 @@
 package io.snabble.sdk.encodedcodes;
 
+import android.util.SparseArray;
+
 import io.snabble.sdk.Project;
 
 public class EncodedCodesOptions {
     public final String prefix;
+    public final SparseArray<String> prefixMap;
     public final String separator;
     public final String suffix;
     public final int maxChars;
@@ -16,12 +19,13 @@ public class EncodedCodesOptions {
     public final int maxSizeMm;
     public final Project project;
 
-    private EncodedCodesOptions(String prefix, String separator, String suffix, int maxChars,
+    private EncodedCodesOptions(String prefix, SparseArray<String> prefixMap, String separator, String suffix, int maxChars,
                                 int maxCodes, String finalCode, String nextCode,
                                 String nextCodeWithCheck, boolean repeatCodes, String countSeparator,
                                 int maxSizeMm,
                                 Project project) {
         this.prefix = prefix;
+        this.prefixMap = prefixMap;
         this.separator = separator;
         this.suffix = suffix;
         this.maxChars = maxChars;
@@ -38,6 +42,7 @@ private EncodedCodesOptions(String prefix, String separator, String suffix, int
     public static class Builder {
         private Project project;
         private String prefix = "";
+        private SparseArray<String> prefixMap = new SparseArray<>();
         private String separator = "\n";
         private String suffix = "";
         private int maxChars = 2953;
@@ -58,6 +63,11 @@ public Builder prefix(String prefix) {
             return this;
         }
 
+        public Builder prefix(int index, String prefix) {
+            prefixMap.put(index, prefix);
+            return this;
+        }
+
         public Builder separator(String separator) {
             this.separator = separator;
             return this;
@@ -109,7 +119,7 @@ public Builder maxSizeMm(int maxSizeMm) {
         }
 
         public EncodedCodesOptions build() {
-            return new EncodedCodesOptions(prefix, separator, suffix, maxChars, maxCodes,
+            return new EncodedCodesOptions(prefix, prefixMap, separator, suffix, maxChars, maxCodes,
                     finalCode, nextCode, nextCodeWithCheck, repeatCodes, countSeparator, maxSizeMm, project);
         }
     }

ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutView.java

@@ -138,15 +138,18 @@ private void displayPaymentView() {
                     maxCodes = options.maxCodes;
                 }
 
-                String prefix = "9100003\u001d100{qrCodeCount}";
+                String prefix = "9100003\u001d100{qrCodeCount}\u001d240";
+
+                String prefixWithCustomerCard = "9100003\u001d100{qrCodeCount}";
                 if (project.getCustomerCardId() != null) {
-                    prefix += "\u001d92" + project.getCustomerCardId();
+                    prefixWithCustomerCard += "\u001d92" + project.getCustomerCardId();
                 }
-                prefix += "\u001d240";
+                prefixWithCustomerCard += "\u001d240";
 
                 displayView(new CheckoutEncodedCodesView(getContext(),
                         new EncodedCodesOptions.Builder(project)
                         .prefix(prefix)
+                        .prefix(0, prefixWithCustomerCard)
                         .separator("\u001d240")
                         .suffix("")
                         .maxCodes(maxCodes)