fix listing of sepa cards in payment credentials list view

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.49.2]
+
+### Fixed
+- Fixed added SEPA Cards not showing up in payment credentials list view
+
 ## [0.49.1]
 
 ### Fixed

build.gradle

@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.49.1'
+        sdkVersion='0.49.2'
         versionCode=1
 
         compileSdkVersion=31

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

@@ -179,7 +179,7 @@ public static PaymentCredentials fromSEPA(String name, String iban) {
         pc.brand = Brand.UNKNOWN;
         pc.appId = Snabble.getInstance().getConfig().appId;
 
-        if (pc.encryptedData == null) {
+        if (pc.rsaEncryptedData == null) {
             return null;
         }
 
@@ -380,7 +380,7 @@ public static PaymentCredentials fromTegutEmployeeCard(String obfuscatedId, Stri
         data.cardNumber = cardNumber;
         String json = GsonHolder.get().toJson(data, TegutEmployeeCard.class);
 
-        pc.encryptedData = pc.rsaEncrypt(certificate, json.getBytes());
+        pc.rsaEncryptedData = pc.rsaEncrypt(certificate, json.getBytes());
         pc.signature = pc.sha256Signature(certificate);
         pc.brand = Brand.UNKNOWN;
         pc.appId = Snabble.getInstance().getConfig().appId;

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

@@ -303,6 +303,10 @@ public int getCountForProject(Project project) {
                     if (pc.getProjectId().equals(project.getId()) && onlineMethods.contains(pc.getPaymentMethod())) {
                         count++;
                     }
+                } else {
+                    if (pc.getType() == PaymentCredentials.Type.SEPA && onlineMethods.contains(pc.getPaymentMethod())) {
+                        count++;
+                    }
                 }
             }
         }

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

@@ -167,9 +167,17 @@ public void onChanged() {
                 sameProjectOrNull = project.getId().equals(pm.getProjectId());
             }
 
+            if (pm.getProjectId() == null && pm.getType() == PaymentCredentials.Type.SEPA) {
+                sameProjectOrNull = true;
+            }
+
             boolean sameTypeOrNull = true;
             if (types != null) {
-                sameTypeOrNull = types.contains(pm.getType());
+                if (project != null) {
+                    sameTypeOrNull = project.getAvailablePaymentMethods().contains(pm.getPaymentMethod());
+                } else {
+                    sameTypeOrNull = types.contains(pm.getType());
+                }
             }
 
             if (pm.isAvailableInCurrentApp() && sameTypeOrNull && sameProjectOrNull) {