replace the raw response from an account transaction with that of the equivalent requeried transaction response

Author: biodunalfet

raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountContract.java

@@ -29,7 +29,7 @@ interface View {
 
         void onPaymentFailed(String status, String responseAsJSONString);
 
-        void onValidateSuccessful(String message, String responseAsJSONString);
+        void onValidateSuccessful(String flwRef, String responseAsJSONString);
 
         void onValidateError(String message, String responseAsJSONString);
 

raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java

@@ -380,9 +380,9 @@ public void onPaymentFailed(String status, String responseAsJSONString) {
     }
 
     @Override
-    public void onValidateSuccessful(String status, String responseAsJsonString) {
+    public void onValidateSuccessful(String flwRef, String responseAsJsonString) {
         dismissSheets();
-        onPaymentSuccessful(status, responseAsJsonString);
+        presenter.requeryTx(flwRef, ravePayInitializer.getSecretKey());
     }
 
     @Override

raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountPresenter.java

@@ -96,7 +96,7 @@ public void onError(String message, String responseAsJSONString) {
     }
 
     @Override
-    public void validateAccountCharge(String flwRef, String otp, String PBFPubKey) {
+    public void validateAccountCharge(final String flwRef, String otp, String PBFPubKey) {
 
         ValidateChargeBody body = new ValidateChargeBody();
         body.setPBFPubKey(PBFPubKey);
@@ -115,7 +115,7 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
                     String message = response.getMessage();
 
                     if (status.equalsIgnoreCase("success")) {
-                        mView.onValidateSuccessful(status, responseAsJSONString);
+                        mView.onValidateSuccessful(flwRef, responseAsJSONString);
                     }
                     else {
                         mView.onValidateError(status, responseAsJSONString);

raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardContract.java

@@ -54,6 +54,8 @@ interface View {
         void onAVS_VBVSECURECODEModelSuggested(Payload payload);
 
         void onAVSVBVSecureCodeModelUsed(String authurl, String flwRef);
+
+        void onValidateCardChargeFailed(String flwRef, String responseAsJSON);
     }
 
     interface UserActionsListener {

raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java

@@ -245,6 +245,16 @@ public void onClick(View v) {
 
     }
 
+    @Override
+    public void onValidateCardChargeFailed(String flwRef, String responseAsJSON) {
+
+        dismissDialog();
+        bottomSheetBehaviorVBV.setState(BottomSheetBehavior.STATE_COLLAPSED);
+
+        presenter.requeryTx(flwRef, ravePayInitializer.getSecretKey(), false);
+
+    }
+
     /**
      *  Validate card details and get the fee if available
      */

raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardPresenter.java

@@ -172,7 +172,7 @@ public void onError(String message, String responseAsJSONString) {
     }
 
     @Override
-    public void validateCardCharge(String flwRef, String otp, String PBFPubKey) {
+    public void validateCardCharge(final String flwRef, String otp, String PBFPubKey) {
 
         ValidateChargeBody body = new ValidateChargeBody();
         body.setPBFPubKey(PBFPubKey);
@@ -198,7 +198,7 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
                     }
                 }
                 else {
-                    mView.onPaymentFailed("Invalid charge card response", responseAsJSONString);
+                    mView.onValidateCardChargeFailed(flwRef, responseAsJSONString);
                 }
             }