filter payment methods by appId

Author: ajungg

CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 - A short Checkout-ID is now visible while in payment 
 - Hide bundles of products without a price
 - Removed restriction to german IBAN's
+- Filter payment methods by appId
 
 ### New String Keys
 - Snabble.Payment.cancelError.title

core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java

@@ -63,6 +63,7 @@ private static class CreditCardData {
     private long validTo;
     private Type type;
     private Brand brand;
+    private String appId;
 
     private PaymentCredentials() {
 
@@ -97,6 +98,7 @@ public static PaymentCredentials fromSEPA(String name, String iban) {
         pc.encrypt();
         pc.signature = pc.sha256Signature(certificate);
         pc.brand = Brand.UNKNOWN;
+        pc.appId = Snabble.getInstance().getConfig().appId;
 
         if (pc.encryptedData == null) {
             return null;
@@ -144,6 +146,7 @@ public static PaymentCredentials fromCreditCardData(String name, Brand brand, St
         pc.encrypt();
         pc.signature = pc.sha256Signature(certificate);
         pc.brand = brand;
+        pc.appId = Snabble.getInstance().getConfig().appId;
 
         try {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/yyyy");
@@ -181,6 +184,10 @@ public Brand getBrand() {
         return brand;
     }
 
+    public String getAppId() {
+        return appId;
+    }
+
     private String obfuscate(String s) {
         int numCharsStart = 4;
         int numCharsEnd = 2;
@@ -330,6 +337,15 @@ public boolean validate() {
         return false;
     }
 
+    boolean checkAppId() {
+        if (appId == null) {
+            appId = Snabble.getInstance().getConfig().appId;
+            return true;
+        }
+
+        return false;
+    }
+
     public long getValidTo() {
         return validTo;
     }

core/src/main/java/io/snabble/sdk/payment/PaymentCredentialsStore.java

@@ -173,6 +173,12 @@ private void validate() {
             if (!credentials.validate()) {
                 data.credentialsList.remove(credentials);
                 changed = true;
+            } else {
+                // app id's were not stored in old versions, if its not there assume the
+                // current app id was the app id in which the payment method was created
+                if (credentials.checkAppId()) {
+                    changed = true;
+                }
             }
         }
 

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

@@ -214,7 +214,8 @@ private List<PaymentCredentials> getPaymentCredentials(PaymentMethod pm) {
 
         List<PaymentCredentials> paymentCredentials = paymentCredentialsStore.getAll();
         for (PaymentCredentials pc : paymentCredentials) {
-            if (pc.getType() == getType(pm) && pc.getBrand() == getBrand(pm)) {
+            if (pc.getType() == getType(pm) && pc.getBrand() == getBrand(pm)
+                    && Snabble.getInstance().getConfig().appId.equals(pc.getAppId())) {
                 list.add(pc);
             }
         }

ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java

@@ -138,24 +138,26 @@ public void onChanged() {
         List<PaymentCredentials> paymentCredentials = paymentCredentialsStore.getAll();
 
         for (PaymentCredentials pm : paymentCredentials) {
-            if (pm.getType() == PaymentCredentials.Type.SEPA) {
-                entries.add(new Entry(pm, R.drawable.snabble_ic_sepa_small, pm.getObfuscatedId()));
-            } else if (pm.getType() == PaymentCredentials.Type.CREDIT_CARD) {
-                PaymentCredentials.Brand ccBrand = pm.getBrand();
-
-                int drawableResId = 0;
-                if (ccBrand != null) {
-                    switch (ccBrand) {
-                        case VISA:
-                            drawableResId = R.drawable.snabble_ic_visa;
-                            break;
-                        case MASTERCARD:
-                            drawableResId = R.drawable.snabble_ic_mastercard;
-                            break;
+            if (Snabble.getInstance().getConfig().appId.equals(pm.getAppId())) {
+                if (pm.getType() == PaymentCredentials.Type.SEPA) {
+                    entries.add(new Entry(pm, R.drawable.snabble_ic_sepa_small, pm.getObfuscatedId()));
+                } else if (pm.getType() == PaymentCredentials.Type.CREDIT_CARD) {
+                    PaymentCredentials.Brand ccBrand = pm.getBrand();
+
+                    int drawableResId = 0;
+                    if (ccBrand != null) {
+                        switch (ccBrand) {
+                            case VISA:
+                                drawableResId = R.drawable.snabble_ic_visa;
+                                break;
+                            case MASTERCARD:
+                                drawableResId = R.drawable.snabble_ic_mastercard;
+                                break;
+                        }
                     }
-                }
 
-                entries.add(new Entry(pm, drawableResId, pm.getObfuscatedId()));
+                    entries.add(new Entry(pm, drawableResId, pm.getObfuscatedId()));
+                }
             }
         }