- fix merge conflicts

- correct onInit_inValidAmount_correctParamPassed

Author: biodunalfet

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

@@ -8,9 +8,10 @@
 import com.flutterwave.raveandroid.FeeCheckRequestBody;
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.PayloadBuilder;
+import com.flutterwave.raveandroid.PayloadEncryptor;
+import com.flutterwave.raveandroid.PayloadToJsonConverter;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.TransactionStatusChecker;
-import com.flutterwave.raveandroid.Utils;
 import com.flutterwave.raveandroid.ViewObject;
 import com.flutterwave.raveandroid.card.ChargeRequestBody;
 import com.flutterwave.raveandroid.data.Bank;
@@ -89,6 +90,10 @@ public class AccountPresenter implements AccountContract.UserActionsListener {
     TransactionStatusChecker transactionStatusChecker;
     @Inject
     NetworkRequestImpl networkRequest;
+    @Inject
+    PayloadToJsonConverter payloadToJsonConverter;
+    @Inject
+    PayloadEncryptor payloadEncryptor;
 
     @Inject
     AccountPresenter(Context context, AccountContract.View mView) {
@@ -120,8 +125,8 @@ public void onError(String message) {
     @Override
     public void chargeAccount(final Payload payload, String encryptionKey, final boolean internetBanking) {
 
-        String cardRequestBodyAsString = Utils.convertChargeRequestPayloadToJson(payload);
-        String encryptedCardRequestBody = Utils.getEncryptedData(cardRequestBodyAsString, encryptionKey);
+        String cardRequestBodyAsString = payloadToJsonConverter.convertChargeRequestPayloadToJson(payload);
+        String encryptedCardRequestBody = payloadEncryptor.getEncryptedData(cardRequestBodyAsString, encryptionKey);
 
         ChargeRequestBody body = new ChargeRequestBody();
         body.setAlg("3DES-24");

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchContract.java

@@ -32,7 +32,7 @@ interface View {
     interface UserActionsListener {
         void init(RavePayInitializer ravePayInitializer);
 
-        void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amount);
+        void onDataCollected(RavePayInitializer ravePayInitializer, String amount);
 
         void verifyRequeryResponse(RequeryResponse response, String responseAsJSONString, RavePayInitializer ravePayInitializer, String flwRef);
 

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java

@@ -96,7 +96,7 @@ public void onClick(View view) {
         int i = view.getId();
         if (i == R.id.rave_payButton) {
             String amount = amountEt.getText().toString();
-            presenter.onPayButtonClicked(ravePayInitializer, amount);
+            presenter.onDataCollected(ravePayInitializer, amount);
         }
     }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchPresenter.java

@@ -69,11 +69,11 @@ public void init(RavePayInitializer ravePayInitializer) {
     }
 
     @Override
-    public void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amount) {
+    public void onDataCollected(RavePayInitializer ravePayInitializer, String amount) {
 
         mView.showAmountError(null);
 
-        boolean isAmountValid = amountValidator.isAmountValid(ravePayInitializer.getAmount());
+        boolean isAmountValid = amountValidator.isAmountValid(amount);
 
         if (isAmountValid) {
             mView.onValidationSuccessful(amount);
@@ -86,28 +86,31 @@ public void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amo
     @Override
     public void processTransaction(String amount, final RavePayInitializer ravePayInitializer, final boolean isDisplayFee) {
 
-        ravePayInitializer.setAmount(Double.parseDouble(amount));
-        PayloadBuilder builder = new PayloadBuilder();
-        builder.setAmount(ravePayInitializer.getAmount() + "")
-                .setCountry(ravePayInitializer.getCountry())
-                .setCurrency(ravePayInitializer.getCurrency())
-                .setEmail(ravePayInitializer.getEmail())
-                .setFirstname(ravePayInitializer.getfName())
-                .setLastname(ravePayInitializer.getlName())
-                .setIP(deviceIdGetter.getDeviceId())
-                .setTxRef(ravePayInitializer.getTxRef())
-                .setMeta(ravePayInitializer.getMeta())
-                .setPBFPubKey(ravePayInitializer.getPublicKey())
-                .setIsUsBankCharge(ravePayInitializer.isWithAch())
-                .setDevice_fingerprint(deviceIdGetter.getDeviceId());
-
-        if (ravePayInitializer.getPayment_plan() != null) {
-            builder.setPaymentPlan(ravePayInitializer.getPayment_plan());
-        }
+        if (ravePayInitializer != null) {
 
-        Payload body = builder.createBankPayload();
+            ravePayInitializer.setAmount(Double.parseDouble(amount));
+            PayloadBuilder builder = new PayloadBuilder();
+            builder.setAmount(ravePayInitializer.getAmount() + "")
+                    .setCountry(ravePayInitializer.getCountry())
+                    .setCurrency(ravePayInitializer.getCurrency())
+                    .setEmail(ravePayInitializer.getEmail())
+                    .setFirstname(ravePayInitializer.getfName())
+                    .setLastname(ravePayInitializer.getlName())
+                    .setIP(deviceIdGetter.getDeviceId())
+                    .setTxRef(ravePayInitializer.getTxRef())
+                    .setMeta(ravePayInitializer.getMeta())
+                    .setPBFPubKey(ravePayInitializer.getPublicKey())
+                    .setIsUsBankCharge(ravePayInitializer.isWithAch())
+                    .setDevice_fingerprint(deviceIdGetter.getDeviceId());
+
+            if (ravePayInitializer.getPayment_plan() != null) {
+                builder.setPaymentPlan(ravePayInitializer.getPayment_plan());
+            }
 
-        chargeAccount(body, ravePayInitializer.getEncryptionKey(), ravePayInitializer.getIsDisplayFee());
+            Payload body = builder.createBankPayload();
+
+            chargeAccount(body, ravePayInitializer.getEncryptionKey(), ravePayInitializer.getIsDisplayFee());
+        }
     }
 
 

raveandroid/src/main/java/com/flutterwave/raveandroid/responses/ChargeResponse.java

@@ -9,6 +9,7 @@ public class ChargeResponse {
     String message;
     Data data;
 
+
     public String getStatus() {
         return status;
     }
@@ -33,6 +34,7 @@ public void setData(Data data) {
         this.data = data;
     }
 
+
     public static class AccountValidateInstructions {
         public String getInstruction() {
             return instruction;
@@ -60,6 +62,11 @@ public static class Data {
         String bankname;
         String note;
         String amount;
+        String validateInstruction;
+
+        public void setValidateInstruction(String validateInstruction) {
+            this.validateInstruction = validateInstruction;
+        }
 
         public String getFlw_reference() {
             return flw_reference;
@@ -99,8 +106,6 @@ public String getValidateInstruction() {
             return validateInstruction;
         }
 
-        String validateInstruction;
-
         public String getTx_ref() {
             return txRef;
         }