If card check is null, allow user proceed with payment, check for null values

Author: taiwoadebayo

rave_java_commons/src/main/java/com/flutterwave/raveandroid/rave_java_commons/RaveConstants.java

@@ -79,7 +79,7 @@ public class RaveConstants {
 
     public static String success = "success";
     public static String noResponse = "No response data was returned";
-    public static String cardNotAllowed = "Card not allowed, please use a card issued in your country";
+    public static String cardNotAllowed = "You can’t fund with cards from other countries yet. Please add a card issued in your country to proceed.";
     public static String invalidAccountNoMessage = "Enter a valid account number";
     public static String invalidDateOfBirthMessage = "Enter a valid date of birth";
     public static String invalidBvnMessage = "Enter a valid BVN";

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/card/CardPaymentHandler.java

@@ -198,16 +198,15 @@ public void checkCard(String cardFirstSix, final Payload body, final Boolean isD
             public void onSuccess(CheckCardResponse response) {
                 mCardInteractor.showProgressIndicator(false);
 
-                if (response.getCountry().getCurrency().equalsIgnoreCase(body.getCurrency())){
-
-                    if (isDisplayFee) {
-                        fetchFee(body);
+                if (response != null && response.getCountry() != null && response.getCountry().getCurrency() != null) {
+                    if (response.getCountry().getCurrency().equalsIgnoreCase(body.getCurrency())) {
+                        continueCharge( isDisplayFee,  body,  encryptionKey);
                     } else {
-                        chargeCard(body, encryptionKey);
+                        mCardInteractor.onPaymentError(cardNotAllowed);
                     }
 
-                }else{
-                    mCardInteractor.onPaymentError(cardNotAllowed);
+                } else {
+                    continueCharge(isDisplayFee, body, encryptionKey);
                 }
 
             }
@@ -221,6 +220,14 @@ public void onError(String message) {
 
     }
 
+    private void continueCharge(boolean isDisplayFee, Payload body, String encryptionKey) {
+        if (isDisplayFee) {
+            fetchFee(body);
+        } else {
+            chargeCard(body, encryptionKey);
+        }
+    }
+
     @Override
     public void chargeSavedCard(Payload payload, String encryptionKey) {
         if (payload.getOtp() == null || payload.getOtp() == "") {
@@ -379,7 +386,7 @@ public void onError(String message) {
     }
 
     @Override
-    public void deleteASavedCard(String cardHash, String phoneNumber, String publicKey){
+    public void deleteASavedCard(String cardHash, String phoneNumber, String publicKey) {
         mCardInteractor.showProgressIndicator(true);
         RemoveSavedCardRequestBody body = new RemoveSavedCardRequestBody(cardHash, phoneNumber, publicKey);
         networkRequest.deleteASavedCard(body, new ResultCallback<SaveCardResponse>() {
@@ -406,7 +413,7 @@ public void lookupSavedCards(String publicKey,
         body.setDevice_key(phoneNumber);
         body.setPublic_key(publicKey);
 
-        if(showLoader)
+        if (showLoader)
             mCardInteractor.showProgressIndicator(true);
 
 

rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/responses/CheckCardResponse.java

@@ -1,12 +1,15 @@
 package com.flutterwave.raveandroid.rave_remote.responses;
 
+import androidx.annotation.Nullable;
+
 public class CheckCardResponse {
 
     Number number;
     String scheme;
     String type;
     String brand;
     boolean prepaid;
+    @Nullable
     Country country;
     Bank bank;
 
@@ -50,11 +53,12 @@ public void setPrepaid(boolean prepaid) {
         this.prepaid = prepaid;
     }
 
+    @Nullable
     public Country getCountry() {
         return country;
     }
 
-    public void setCountry(Country country) {
+    public void setCountry(@Nullable Country country) {
         this.country = country;
     }
 
@@ -94,15 +98,17 @@ public static class Country {
         String alpha2;
         String name;
         String emoji;
+        @Nullable
         String currency;
         int latitude;
         int longitude;
 
+        @Nullable
         public String getCurrency() {
             return currency;
         }
 
-        public void setCurrency(String currency) {
+        public void setCurrency(@Nullable String currency) {
             this.currency = currency;
         }
     }