Card Brand validator depnedency removed

Tap-Payments · Oct 6, 2022 · db3dfe7 · db3dfe7
1 parent 9eb8370
commit db3dfe7
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 6 deletions.
diff --git a/.gradle/6.7/executionHistory/executionHistory.bin b/.gradle/6.7/executionHistory/executionHistory.bin
diff --git a/.gradle/6.7/executionHistory/executionHistory.lock b/.gradle/6.7/executionHistory/executionHistory.lock
diff --git a/.gradle/6.7/fileChanges/last-build.bin b/.gradle/6.7/fileChanges/last-build.bin
diff --git a/.gradle/6.7/fileHashes/fileHashes.bin b/.gradle/6.7/fileHashes/fileHashes.bin
diff --git a/.gradle/6.7/fileHashes/fileHashes.lock b/.gradle/6.7/fileHashes/fileHashes.lock
diff --git a/.gradle/6.7/fileHashes/resourceHashesCache.bin b/.gradle/6.7/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/6.7/gc.properties b/.gradle/6.7/gc.properties
diff --git a/.gradle/6.7/javaCompile/classAnalysis.bin b/.gradle/6.7/javaCompile/classAnalysis.bin
diff --git a/.gradle/6.7/javaCompile/jarAnalysis.bin b/.gradle/6.7/javaCompile/jarAnalysis.bin
diff --git a/.gradle/6.7/javaCompile/javaCompile.lock b/.gradle/6.7/javaCompile/javaCompile.lock
diff --git a/.gradle/6.7/javaCompile/taskHistory.bin b/.gradle/6.7/javaCompile/taskHistory.bin
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/.gradle/configuration-cache/gc.properties b/.gradle/configuration-cache/gc.properties
diff --git a/.idea/modules/AndroidXSDK.iml b/.idea/modules/AndroidXSDK.iml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # CHANGELOG
+[3.15.12] - 2022-10-06
+### Hot Fix:
+- Minor Hot fix for dynamic card brand name
+### Impact on existing integrations:
+- The update does not impact existing integrations.
+### Recommended changes for existing integrations before updating:
+- None.
 [3.15.11] - 2022-08-28
 ### Hot Fix:
 - Minor Hot fix for callback added

diff --git a/README.md b/README.md
@@ -97,7 +97,7 @@ To integrate goSellSDK into your project add it in your **root** `build.gradle`
 Step 2. Add the dependency
 ```java
 	dependencies {
-	        implementation 'com.github.Tap-Payments:goSellSDK-AndroidX:3.15.11'
+	        implementation 'com.github.Tap-Payments:goSellSDK-AndroidX:3.15.12'
 	}
 ```
 

diff --git a/...src/main/java/company/tap/gosellapi/internal/adapters/CardSystemsRecyclerViewAdapter.java b/...src/main/java/company/tap/gosellapi/internal/adapters/CardSystemsRecyclerViewAdapter.java
@@ -175,7 +175,7 @@ private boolean comparePaymentOptionWithCardScheme(@NonNull PaymentOption paymen
     }
 
 
-    if (paymentOption.getBrand().compareTo(cardScheme.getCardBrand()) == 0) {
+    if (paymentOption.getName().compareTo(String.valueOf(cardScheme.getCardBrand())) == 0) {
       return true;
     }
 // stop this check to avoid displaying mada with master in case of scheme is not mada

diff --git a/library/src/main/java/company/tap/gosellapi/internal/api/models/PaymentOption.java b/library/src/main/java/company/tap/gosellapi/internal/api/models/PaymentOption.java
@@ -24,7 +24,7 @@ public final class PaymentOption implements Comparable<PaymentOption>, Currencie
 
     @SerializedName("name")
     @Expose
-    private CardBrand brand;
+    private String name;
 
     @SerializedName("image")
     @Expose
@@ -60,7 +60,7 @@ public final class PaymentOption implements Comparable<PaymentOption>, Currencie
     @SerializedName("asynchronous")
     @Expose
     private boolean asynchronous;
-
+    private CardBrand brand;
     /**
      * Gets id.
      *
@@ -85,7 +85,7 @@ public String getSourceId() {
      * @return the name
      */
     public String getName() {
-        return (getBrand()!=null)? getBrand().getRawValue():"";
+        return (getBrand()!=null)? getBrand().getRawValue():name;
     }
 
     /**
@@ -94,6 +94,12 @@ public String getName() {
      * @return the brand
      */
     public CardBrand getBrand() {
+        // System.out.println("name values are#######"+name);
+        for (CardBrand brand : CardBrand.values()) {
+            if (brand.name().equalsIgnoreCase(name)) {
+                return brand;
+            }
+        }
         return brand;
     }
 

diff --git a/...osellapi/internal/data_managers/payment_options/view_models/CardCredentialsViewModel.java b/...osellapi/internal/data_managers/payment_options/view_models/CardCredentialsViewModel.java
@@ -425,7 +425,7 @@ public void setPaymentOption(CardBrand cardBrand,CardScheme cardScheme) {
       }else {
           if(cardBrand!=null){
               for(PaymentOption paymentOption:  data.getPaymentOptions()){
-                  if(paymentOption.getBrand().compareTo(cardBrand)==0){
+                  if(paymentOption.getName().compareTo(String.valueOf(cardBrand))==0){
                       this.selectedCardPaymentOption = paymentOption;
                       updatePayButtonWithExtraFees(paymentOption);
                   }