apply new encoded codes config when customer card is set, csv format is now using separator instead of hardcoded newlines

Author: ajungg

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

@@ -68,6 +68,7 @@ public class Project {
 
     private int maxOnlinePaymentLimit;
     private int maxCheckoutLimit;
+    private JsonObject encodedCodesJsonObject;
 
     Project(JsonObject jsonObject) throws IllegalArgumentException {
         Snabble snabble = Snabble.getInstance();
@@ -133,8 +134,8 @@ void parse(JsonObject jsonObject) {
         if (jsonObject.has("qrCodeOffline")) {
             JsonElement encodedCodes = jsonObject.get("qrCodeOffline");
             if (!encodedCodes.isJsonNull()) {
-                JsonObject object = encodedCodes.getAsJsonObject();
-                encodedCodesOptions = EncodedCodesOptions.fromJsonObject(this, object);
+                encodedCodesJsonObject = encodedCodes.getAsJsonObject();
+                encodedCodesOptions = EncodedCodesOptions.fromJsonObject(this, encodedCodesJsonObject);
             }
         }
 
@@ -435,6 +436,10 @@ public void logErrorEvent(String format, Object... args) {
      */
     public void setCustomerCardId(String loyaltyCardId) {
         this.loyaltyCardId = loyaltyCardId;
+
+        if (encodedCodesJsonObject != null) {
+            encodedCodesOptions = EncodedCodesOptions.fromJsonObject(this, encodedCodesJsonObject);
+        }
     }
 
     public String getCustomerCardId() {

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

@@ -130,22 +130,24 @@ public EncodedCodesOptions build() {
         }
     }
 
-    public static EncodedCodesOptions fromJsonObject(Project project, JsonObject object) {
-        String format = JsonUtils.getStringOpt(object, "format", "simple");
+    public static EncodedCodesOptions fromJsonObject(Project project, JsonObject jsonObject) {
+        String format = JsonUtils.getStringOpt(jsonObject, "format", "simple");
+        String separator = JsonUtils.getStringOpt(jsonObject, "separator", "\n");
+
         switch (format) {
             case "csv":
                 return new EncodedCodesOptions.Builder(project)
-                        .prefix("snabble;{qrCodeCount};{count}\n")
-                        .separator("\n")
+                        .prefix("snabble;{qrCodeCount};{count}" + separator)
+                        .separator(separator)
                         .suffix("")
                         .repeatCodes(false)
                         .countSeparator(";")
                         .maxCodes(100)
                         .build();
             case "csv_globus":
                 return new EncodedCodesOptions.Builder(project)
-                        .prefix("snabble;\n")
-                        .separator("\n")
+                        .prefix("snabble;" + separator)
+                        .separator(separator)
                         .suffix("")
                         .repeatCodes(false)
                         .countSeparator(";")
@@ -179,15 +181,15 @@ public static EncodedCodesOptions fromJsonObject(Project project, JsonObject obj
             case "simple":
             default:
                 return new EncodedCodesOptions.Builder(project)
-                        .prefix(JsonUtils.getStringOpt(object, "prefix", ""))
-                        .separator(JsonUtils.getStringOpt(object, "separator", "\n"))
-                        .suffix(JsonUtils.getStringOpt(object, "suffix", ""))
-                        .maxCodes(JsonUtils.getIntOpt(object, "maxCodes", 100))
-                        .finalCode(JsonUtils.getStringOpt(object, "finalCode", ""))
-                        .nextCode(JsonUtils.getStringOpt(object, "nextCode", ""))
-                        .nextCodeWithCheck(JsonUtils.getStringOpt(object, "nextCodeWithCheck", ""))
-                        .maxSizeMm(JsonUtils.getIntOpt(object, "maxSizeMM", -1))
-                        .maxChars(JsonUtils.getIntOpt(object, "maxChars", EncodedCodesOptions.DEFAULT_MAX_CHARS))
+                        .prefix(JsonUtils.getStringOpt(jsonObject, "prefix", ""))
+                        .separator(JsonUtils.getStringOpt(jsonObject, "separator", "\n"))
+                        .suffix(JsonUtils.getStringOpt(jsonObject, "suffix", ""))
+                        .maxCodes(JsonUtils.getIntOpt(jsonObject, "maxCodes", 100))
+                        .finalCode(JsonUtils.getStringOpt(jsonObject, "finalCode", ""))
+                        .nextCode(JsonUtils.getStringOpt(jsonObject, "nextCode", ""))
+                        .nextCodeWithCheck(JsonUtils.getStringOpt(jsonObject, "nextCodeWithCheck", ""))
+                        .maxSizeMm(JsonUtils.getIntOpt(jsonObject, "maxSizeMM", -1))
+                        .maxChars(JsonUtils.getIntOpt(jsonObject, "maxChars", EncodedCodesOptions.DEFAULT_MAX_CHARS))
                         .build();
         }
     }