added support for qrCodeOffline metadata

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.14.14]
+
+### Added
+- Support for new qrCodeOffline metadata
+
+### Changed
+- Removed support for old encodedCodes payment methods
+
 ## [0.14.13]
 
 ### Added

build.gradle

@@ -23,7 +23,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.14.13'
+        sdkVersion='0.14.14'
         versionCode=1
 
         compileSdkVersion=28

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

@@ -5,12 +5,8 @@
 public enum PaymentMethod {
     @SerializedName("qrCodePOS")
     QRCODE_POS(false, false),
-    @SerializedName("encodedCodes")
-    ENCODED_CODES(true, false),
-    @SerializedName("encodedCodesCSV")
-    ENCODED_CODES_CSV(true, false),
-    @SerializedName("encodedCodesIKEA")
-    ENCODED_CODES_IKEA(true, false),
+    @SerializedName("qrCodeOffline")
+    QRCODE_OFFLINE(true, false),
     @SerializedName("deDirectDebit")
     DE_DIRECT_DEBIT(false, true);
 

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

@@ -130,22 +130,11 @@ void parse(JsonObject jsonObject) {
 
         isCheckoutAvailable = JsonUtils.getBooleanOpt(jsonObject, "enableCheckout", true);
 
-        if (jsonObject.has("encodedCodes")) {
-            JsonElement encodedCodes = jsonObject.get("encodedCodes");
+        if (jsonObject.has("qrCodeOffline")) {
+            JsonElement encodedCodes = jsonObject.get("qrCodeOffline");
             if (!encodedCodes.isJsonNull()) {
                 JsonObject object = encodedCodes.getAsJsonObject();
-
-                encodedCodesOptions = new EncodedCodesOptions.Builder(this)
-                        .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))
-                        .build();
+                encodedCodesOptions = EncodedCodesOptions.fromJsonObject(this, object);
             }
         }
 

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

@@ -2,7 +2,11 @@
 
 import android.util.SparseArray;
 
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.SerializedName;
+
 import io.snabble.sdk.Project;
+import io.snabble.sdk.utils.JsonUtils;
 
 public class EncodedCodesOptions {
     public static final int DEFAULT_MAX_CHARS = 2953;
@@ -125,4 +129,66 @@ public EncodedCodesOptions build() {
                     finalCode, nextCode, nextCodeWithCheck, repeatCodes, countSeparator, maxSizeMm, project);
         }
     }
+
+    public static EncodedCodesOptions fromJsonObject(Project project, JsonObject object) {
+        String format = JsonUtils.getStringOpt(object, "format", "simple");
+        switch (format) {
+            case "csv":
+                return new EncodedCodesOptions.Builder(project)
+                        .prefix("snabble;{qrCodeCount};{count}\n")
+                        .separator("\n")
+                        .suffix("")
+                        .repeatCodes(false)
+                        .countSeparator(";")
+                        .maxCodes(100)
+                        .build();
+            case "csv_globus":
+                return new EncodedCodesOptions.Builder(project)
+                        .prefix("snabble;\n")
+                        .separator("\n")
+                        .suffix("")
+                        .repeatCodes(false)
+                        .countSeparator(";")
+                        .maxCodes(100)
+                        .build();
+            case "ikea":
+                EncodedCodesOptions options = project.getEncodedCodesOptions();
+                int maxCodes = 45;
+                int maxChars = EncodedCodesOptions.DEFAULT_MAX_CHARS;
+                if (options != null) {
+                    maxCodes = options.maxCodes;
+                    maxChars = options.maxChars;
+                }
+
+                String prefix = "9100003\u001d100{qrCodeCount}\u001d240";
+
+                String prefixWithCustomerCard = "9100003\u001d100{qrCodeCount}";
+                if (project.getCustomerCardId() != null) {
+                    prefixWithCustomerCard += "\u001d92" + project.getCustomerCardId();
+                }
+                prefixWithCustomerCard += "\u001d240";
+
+                return new EncodedCodesOptions.Builder(project)
+                                .prefix(prefix)
+                                .prefix(0, prefixWithCustomerCard)
+                                .separator("\u001d240")
+                                .suffix("")
+                                .maxCodes(maxCodes)
+                                .maxChars(maxChars)
+                                .build();
+            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))
+                        .build();
+        }
+    }
 }

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

@@ -53,13 +53,6 @@ public CheckoutEncodedCodesView(Context context) {
         inflateView(project.getEncodedCodesOptions());
     }
 
-    public CheckoutEncodedCodesView(Context context, EncodedCodesOptions options) {
-        super(context);
-
-        project = SnabbleUI.getProject();
-        inflateView(options);
-    }
-
     private void inflateView(EncodedCodesOptions options) {
         inflate(getContext(), R.layout.snabble_view_checkout_encodedcodes, this);
 

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

@@ -142,47 +142,9 @@ private void displayPaymentView() {
                 checkoutQRCodePOSView.setQRCodeText(checkout.getQRCodePOSContent());
                 displayView(checkoutQRCodePOSView);
                 break;
-            case ENCODED_CODES:
+            case QRCODE_OFFLINE:
                 displayView(new CheckoutEncodedCodesView(getContext()));
                 break;
-            case ENCODED_CODES_CSV:
-                displayView(new CheckoutEncodedCodesView(getContext(),
-                        new EncodedCodesOptions.Builder(project)
-                        .prefix("snabble;\n")
-                        .separator("\n")
-                        .suffix("")
-                        .repeatCodes(false)
-                        .countSeparator(";")
-                        .maxCodes(100)
-                        .build()));
-                break;
-            case ENCODED_CODES_IKEA:
-                EncodedCodesOptions options = project.getEncodedCodesOptions();
-                int maxCodes = 45;
-                int maxChars = EncodedCodesOptions.DEFAULT_MAX_CHARS;
-                if (options != null) {
-                    maxCodes = options.maxCodes;
-                    maxChars = options.maxChars;
-                }
-
-                String prefix = "9100003\u001d100{qrCodeCount}\u001d240";
-
-                String prefixWithCustomerCard = "9100003\u001d100{qrCodeCount}";
-                if (project.getCustomerCardId() != null) {
-                    prefixWithCustomerCard += "\u001d92" + project.getCustomerCardId();
-                }
-                prefixWithCustomerCard += "\u001d240";
-
-                displayView(new CheckoutEncodedCodesView(getContext(),
-                        new EncodedCodesOptions.Builder(project)
-                        .prefix(prefix)
-                        .prefix(0, prefixWithCustomerCard)
-                        .separator("\u001d240")
-                        .suffix("")
-                        .maxCodes(maxCodes)
-                        .maxChars(maxChars)
-                        .build()));
-                break;
         }
     }
 

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

@@ -54,8 +54,7 @@ class PaymentMethodView extends FrameLayout implements PaymentCredentialsStore.C
     static {
         icons.put(PaymentMethod.DE_DIRECT_DEBIT, R.drawable.snabble_ic_pm_sepa);
         icons.put(PaymentMethod.QRCODE_POS, R.drawable.snabble_ic_pm_checkstand);
-        icons.put(PaymentMethod.ENCODED_CODES, R.drawable.snabble_ic_pm_checkstand);
-        icons.put(PaymentMethod.ENCODED_CODES_CSV, R.drawable.snabble_ic_pm_checkstand);
+        icons.put(PaymentMethod.QRCODE_OFFLINE, R.drawable.snabble_ic_pm_checkstand);
     }
 
     private Checkout checkout;