Injected payloadToJsonConverter and payloadEncryptor class instead of the utils static classes

Added setValidateInstruction()
Create and reordered tests with correct parameters

Author: mikelis135

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/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;
         }