Merge branch 'adjustValidateMessage'

# Conflicts:
#	rave_java_commons/src/main/java/com/flutterwave/raveandroid/rave_java_commons/RaveConstants.java

Author: jeremiahAI

rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java

@@ -360,15 +360,20 @@ public void onPaymentError(String message) {
     }
 
     @Override
-    public void showPollingIndicator(boolean active) {
+    public void showPollingIndicator(boolean active, String validateInstruction) {
         if (getActivity() == null || getActivity().isFinishing()) {
             return;
         }
 
         if (pollingProgressDialog == null) {
             pollingProgressDialog = new ProgressDialog(getActivity());
             pollingProgressDialog.setCanceledOnTouchOutside(false);
-            pollingProgressDialog.setMessage(Html.fromHtml(validateInstructions));
+
+            if (validateInstruction.isEmpty()) {
+                pollingProgressDialog.setMessage(Html.fromHtml(validateInstructions));
+            }else {
+                pollingProgressDialog.setMessage(Html.fromHtml(validateInstruction));
+            }
         }
 
         if (active && !pollingProgressDialog.isShowing()) {

rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java

@@ -23,7 +23,7 @@ public void onPaymentError(String message) {
     }
 
     @Override
-    public void showPollingIndicator(boolean active) {
+    public void showPollingIndicator(boolean active, String validateInstruction) {
 
     }
 

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

@@ -171,4 +171,5 @@ public class RaveConstants {
 
     public static final String responseParsingError = "Error parsing server response";
     public static String errorParsingError = "An error occurred parsing the error response";
+    public static String eTransact_GH = "ETRANZACT_GH";
 }

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/ghmobilemoney/GhMobileMoneyContract.java

@@ -2,14 +2,15 @@
 
 import com.flutterwave.raveandroid.rave_java_commons.Payload;
 import com.flutterwave.raveandroid.rave_logger.Event;
+import com.flutterwave.raveandroid.rave_remote.responses.MobileMoneyChargeResponse;
 
 
 public interface GhMobileMoneyContract {
 
     interface Interactor {
         void showFetchFeeFailed(String s);
         void onPaymentError(String message);
-        void showPollingIndicator(boolean active);
+        void showPollingIndicator(boolean active, String validateInstruction);
         void showProgressIndicator(boolean active);
 
         void onTransactionFeeRetrieved(String chargeAmount, Payload payload, String fee);
@@ -21,7 +22,7 @@ interface Interactor {
 
     interface Handler {
         void fetchFee(Payload payload);
-        void requeryTx(String flwRef, String txRef, String publicKey);
+        void requeryTx(String flwRef, String txRef, String publicKey, MobileMoneyChargeResponse.Data data);
         void chargeGhMobileMoney(Payload payload, String encryptionKey);
         void logEvent(Event event, String publicKey);
 

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/ghmobilemoney/GhMobileMoneyHandler.java

@@ -3,6 +3,7 @@
 import android.util.Log;
 
 import com.flutterwave.raveandroid.rave_java_commons.Payload;
+import com.flutterwave.raveandroid.rave_java_commons.RaveConstants;
 import com.flutterwave.raveandroid.rave_logger.Event;
 import com.flutterwave.raveandroid.rave_logger.EventLogger;
 import com.flutterwave.raveandroid.rave_presentation.data.PayloadEncryptor;
@@ -92,7 +93,6 @@ public void chargeGhMobileMoney(final Payload payload, final String encryptionKe
 
         logEvent(new ChargeAttemptEvent("GH Mobile Money").getEvent(), payload.getPBFPubKey());
 
-
         networkRequest.chargeMobileMoneyWallet(body, new ResultCallback<MobileMoneyChargeResponse>() {
             @Override
             public void onSuccess(MobileMoneyChargeResponse response) {
@@ -106,7 +106,7 @@ public void onSuccess(MobileMoneyChargeResponse response) {
                     } else {
                         String flwRef = data.getFlwRef();
                         String txRef = data.getTx_ref();
-                        requeryTx(flwRef, txRef, payload.getPBFPubKey());
+                        requeryTx(flwRef, txRef, payload.getPBFPubKey(), data);
                     }
                 } else {
                     mInteractor.onPaymentError(noResponse);
@@ -124,18 +124,23 @@ public void onError(String message) {
 
     @Override
     public void requeryTx(final String publicKey) {
-        requeryTx(null, txRef, publicKey);
+        requeryTx(null, txRef, publicKey, null);
     }
 
     @Override
-    public void requeryTx(final String flwRef, final String txRef, final String publicKey) {
+    public void requeryTx(final String flwRef, final String txRef, final String publicKey, final MobileMoneyChargeResponse.Data data) {
 
         RequeryRequestBody body = new RequeryRequestBody();
         body.setFlw_ref(flwRef);
         body.setTx_ref(txRef);
         body.setPBFPubKey(publicKey);
 
-        mInteractor.showPollingIndicator(true);
+        if (data.getProvider().equalsIgnoreCase(RaveConstants.eTransact_GH)){
+            mInteractor.showPollingIndicator(true, data.getValidateInstructions());
+        }else{
+            mInteractor.showPollingIndicator(true, "");
+        }
+
 
         logEvent(new RequeryEvent().getEvent(), publicKey);
 
@@ -149,10 +154,10 @@ public void onSuccess(RequeryResponse response, String responseAsJSONString) {
                     mInteractor.onPaymentFailed(response.getData().getStatus(), responseAsJSONString);
                 } else if (response.getData().getChargeResponseCode().equals("02")) {
                     if (!pollingCancelled) {
-                        requeryTx(flwRef, txRef, publicKey);
+                        requeryTx(flwRef, txRef, publicKey, data);
                     } else mInteractor.onPaymentFailed(response.getStatus(), responseAsJSONString);
                 } else if (response.getData().getChargeResponseCode().equals("00")) {
-                    mInteractor.showPollingIndicator(false);
+                    mInteractor.showPollingIndicator(false, "");
                     mInteractor.onPaymentSuccessful(flwRef, txRef, responseAsJSONString);
                 } else {
                     mInteractor.showProgressIndicator(false);

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/ghmobilemoney/GhMobileMoneyInteractorImpl.java

@@ -66,7 +66,7 @@ public void onPaymentError(String errorMessage) {
     }
 
     @Override
-    public void showPollingIndicator(boolean active) {
+    public void showPollingIndicator(boolean active, String validateInstruction) {
         // Todo: share validation message
         callback.showProgressIndicator(active);
     }

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

@@ -47,7 +47,24 @@ public static class Data {
         @SerializedName("link")
         String captchaLink;
         String code;
+        String provider;
+        String validateInstructions;
 
+        public String getProvider() {
+            return provider;
+        }
+
+        public void setProvider(String provider) {
+            this.provider = provider;
+        }
+
+        public String getValidateInstructions() {
+            return validateInstructions;
+        }
+
+        public void setValidateInstructions(String validateInstructions) {
+            this.validateInstructions = validateInstructions;
+        }
 
         public void setFlwRef(String flwRef) {
             this.flwRef = flwRef;