Add cancel functionality for polling

Author: jeremiahAI

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferContract.java

@@ -3,7 +3,6 @@
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.ViewObject;
-import com.flutterwave.raveandroid.responses.ChargeResponse;
 
 import java.util.HashMap;
 
@@ -25,6 +24,8 @@ interface View {
         void showFieldError(int viewID, String message, Class<?> viewType);
         void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap);
         void onAmountValidationFailed();
+
+        void onPollingCanceled(String flwRef, String txRef, final String responseAsJSONString);
     }
 
     interface UserActionsListener {
@@ -35,5 +36,7 @@ interface UserActionsListener {
         void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayInitializer ravePayInitializer);
         void onDataCollected(HashMap<String, ViewObject> dataHashMap);
         void startPaymentVerification();
+
+        void cancelPolling();
     }
 }

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java

@@ -162,6 +162,7 @@ public void showPollingIndicator(boolean active) {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     pollingProgressDialog.dismiss();
+                    presenter.cancelPolling();
                 }
             });
             pollingProgressDialog.show();
@@ -181,10 +182,20 @@ private void clearErrors() {
     }
 
 
+    @Override
+    public void onPollingCanceled(String flwRef, String txRef, final String responseAsJSONString) {
+        showBackToApp(getString(R.string.bant_transfer_polling_cancelled_message), responseAsJSONString);
+    }
+
+
 
     @Override
     public void onPollingTimeout(String flwRef, String txRef, final String responseAsJSONString) {
-        transferStatusTv.setText(getString(R.string.pay_with_bank_timeout_notification));
+        showBackToApp(getString(R.string.pay_with_bank_timeout_notification), responseAsJSONString);
+    }
+
+    private void showBackToApp(String transferStatusMessage, final String responseAsJSONString) {
+        transferStatusTv.setText(transferStatusMessage);
         transferStatusTv.setVisibility(View.VISIBLE);
 
         verifyPaymentButton.setText(getString(R.string.back_to_app));

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferPresenter.java

@@ -10,7 +10,6 @@
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.Utils;
 import com.flutterwave.raveandroid.ViewObject;
-import com.flutterwave.raveandroid.banktransfer.BankTransferContract;
 import com.flutterwave.raveandroid.card.ChargeRequestBody;
 import com.flutterwave.raveandroid.data.Callbacks;
 import com.flutterwave.raveandroid.data.NetworkRequestImpl;
@@ -32,6 +31,7 @@ public class BankTransferPresenter implements BankTransferContract.UserActionsLi
     private AmountValidator amountValidator = new AmountValidator();
     private String txRef = null, flwRef = null, publicKey = null;
     private long requeryCountdownTime = 0;
+    private boolean pollingCancelled = false;
 
     BankTransferPresenter(Context context, BankTransferContract.View mView) {
         this.context = context;
@@ -123,6 +123,11 @@ public void startPaymentVerification() {
         requeryTx();
     }
 
+    @Override
+    public void cancelPolling() {
+        pollingCancelled = true;
+    }
+
     @Override
     public void requeryTx() {
 
@@ -136,14 +141,17 @@ public void onSuccess(RequeryResponse response, String responseAsJSONString) {
                 if (response.getData() == null) {
                     mView.onPaymentFailed(response.getStatus(), responseAsJSONString);
                 } else if (response.getData().getChargeResponseCode().equals("01")) {
-
-                    if ((System.currentTimeMillis() - requeryCountdownTime) < 300000) {
-                        requeryTx();
-                    } else {
+                    if (pollingCancelled) {
                         mView.showPollingIndicator(false);
-                        mView.onPollingTimeout(flwRef, txRef, responseAsJSONString);
+                        mView.onPollingCanceled(flwRef, txRef, responseAsJSONString);
+                    } else {
+                        if ((System.currentTimeMillis() - requeryCountdownTime) < 300000) {
+                            requeryTx();
+                        } else {
+                            mView.showPollingIndicator(false);
+                            mView.onPollingTimeout(flwRef, txRef, responseAsJSONString);
+                        }
                     }
-
                 } else if (response.getData().getChargeResponseCode().equals("00")) {
                     mView.showPollingIndicator(false);
                     mView.onPaymentSuccessful(flwRef, txRef, responseAsJSONString);

raveandroid/src/main/res/values/strings.xml

@@ -137,6 +137,7 @@
     <string name="currency_placeholder">NGN</string>
     <string name="account_number_placeholder">0690000031</string>
     <string name="pay_with_bank_timeout_notification">Payments are currently slow at your bank. Slow payments are usually confirmed within 30 minutes. You will get a receipt once your payment is confirmed.</string>
+    <string name="bant_transfer_polling_cancelled_message">You will get a receipt once your payment is confirmed.</string>
     <string-array name="gh_mobile_money_networks">
         <item>Select network</item>
         <item>MTN</item>