- corrected some tests

- fix merge conflicts

Author: biodunalfet

raveandroid/src/main/java/com/flutterwave/raveandroid/GetEncryptedData.java

@@ -0,0 +1,27 @@
+package com.flutterwave.raveandroid;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import static com.scottyab.aescrypt.AESCrypt.encrypt;
+
+@Singleton
+public class GetEncryptedData {
+
+    @Inject
+    public GetEncryptedData() {
+    }
+
+    public String getEncryptedData(String unEncryptedString, String encryptionKey) {
+
+        if (unEncryptedString != null && encryptionKey != null) {
+            try {
+                return encrypt(unEncryptedString, encryptionKey);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return "";
+    }
+
+}

raveandroid/src/main/java/com/flutterwave/raveandroid/PayloadToJson.java

@@ -0,0 +1,28 @@
+package com.flutterwave.raveandroid;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class PayloadToJson {
+
+    public Gson gson;
+
+    @Inject
+    public PayloadToJson(Gson gson) {
+        this.gson = gson;
+    }
+
+    public String convertChargeRequestPayloadToJson(Payload body) {
+
+        Type type = new TypeToken<Payload>() {
+        }.getType();
+        return gson.toJson(body, type);
+    }
+
+}

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

@@ -32,7 +32,8 @@ interface View {
 
     interface UserActionsListener {
         void fetchFee(Payload payload);
-        void requeryTx();
+
+        void requeryTx(String flwRef, String txRef, String publicKey, boolean pollingCancelled, long requeryCountdownTime);
         void payWithBankTransfer(Payload body, String encryptionKey);
         void init(RavePayInitializer ravePayInitializer);
         void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayInitializer ravePayInitializer);

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

@@ -4,12 +4,14 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import com.flutterwave.raveandroid.DeviceIdGetter;
 import com.flutterwave.raveandroid.FeeCheckRequestBody;
+import com.flutterwave.raveandroid.GetEncryptedData;
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.PayloadBuilder;
+import com.flutterwave.raveandroid.PayloadToJson;
 import com.flutterwave.raveandroid.RaveConstants;
 import com.flutterwave.raveandroid.RavePayInitializer;
-import com.flutterwave.raveandroid.Utils;
 import com.flutterwave.raveandroid.ViewObject;
 import com.flutterwave.raveandroid.card.ChargeRequestBody;
 import com.flutterwave.raveandroid.data.Callbacks;
@@ -28,6 +30,7 @@
  * Created by hfetuga on 27/06/2018.
  */
 
+
 public class BankTransferPresenter implements BankTransferContract.UserActionsListener {
     private static final String ACCOUNT_NUMBER = "account_number";
     private static final String BANK_NAME = "bank_name";
@@ -41,18 +44,21 @@ public class BankTransferPresenter implements BankTransferContract.UserActionsLi
     AmountValidator amountValidator;
     @Inject
     NetworkRequestImpl networkRequest;
-
-    private Context context;
-    private BankTransferContract.View mView;
+    public boolean pollingCancelled = false;
+    public boolean hasTransferDetails = false;
+    @Inject
+    DeviceIdGetter deviceIdGetter;
+    BankTransferContract.View mView;
     private String txRef = null, flwRef = null, publicKey = null;
     private long requeryCountdownTime = 0;
-    private boolean pollingCancelled = false;
+    @Inject
+    PayloadToJson payloadToJson;
     private String beneficiaryName, accountNumber, amount, bankName;
-    private boolean hasTransferDetails = false;
+    @Inject
+    GetEncryptedData getEncryptedData;
 
     @Inject
     BankTransferPresenter(Context context, BankTransferContract.View mView) {
-        this.context = context;
         this.mView = mView;
     }
 
@@ -74,7 +80,6 @@ public void onSuccess(FeeCheckResponse response) {
                 try {
                     mView.displayFee(response.getData().getCharge_amount(), payload);
                 } catch (Exception e) {
-                    e.printStackTrace();
                     mView.showFetchFeeFailed("An error occurred while retrieving transaction fee");
                 }
             }
@@ -90,8 +95,8 @@ public void onError(String message) {
 
     @Override
     public void payWithBankTransfer(final Payload payload, final String encryptionKey) {
-        String cardRequestBodyAsString = Utils.convertChargeRequestPayloadToJson(payload);
-        String encryptedCardRequestBody = Utils.getEncryptedData(cardRequestBodyAsString, encryptionKey);
+        String cardRequestBodyAsString = payloadToJson.convertChargeRequestPayloadToJson(payload);
+        String encryptedCardRequestBody = getEncryptedData.getEncryptedData(cardRequestBodyAsString, encryptionKey);
         encryptedCardRequestBody = encryptedCardRequestBody.trim().replaceAll("\\n", "");
 
         ChargeRequestBody body = new ChargeRequestBody();
@@ -143,7 +148,7 @@ public void onError(String message, String responseAsJSONString) {
     public void startPaymentVerification() {
         requeryCountdownTime = System.currentTimeMillis();
         mView.showPollingIndicator(true);
-        requeryTx();
+        requeryTx(flwRef, txRef, publicKey, pollingCancelled, requeryCountdownTime);
     }
 
     @Override
@@ -184,15 +189,17 @@ public void restoreState(Bundle savedInstanceState) {
     }
 
     @Override
-    public void requeryTx() {
+    public void requeryTx(final String flwRef, final String txRef, final String publicKey, final boolean pollingCancelled, final long requeryCountdownTime) {
 
         RequeryRequestBody body = new RequeryRequestBody();
         body.setFlw_ref(flwRef);
         body.setPBFPubKey(publicKey);
 
         networkRequest.requeryPayWithBankTx(body, new Callbacks.OnRequeryRequestComplete() {
+
             @Override
             public void onSuccess(RequeryResponse response, String responseAsJSONString) {
+
                 if (response.getData() == null) {
                     mView.onPaymentFailed(response.getStatus(), responseAsJSONString);
                 } else if (response.getData().getChargeResponseCode().equals("01")) {
@@ -201,7 +208,7 @@ public void onSuccess(RequeryResponse response, String responseAsJSONString) {
                         mView.onPollingCanceled(flwRef, txRef, responseAsJSONString);
                     } else {
                         if ((System.currentTimeMillis() - requeryCountdownTime) < 300000) {
-                            requeryTx();
+                            requeryTx(flwRef, txRef, publicKey, pollingCancelled, requeryCountdownTime);
                         } else {
                             mView.showPollingIndicator(false);
                             mView.onPollingTimeout(flwRef, txRef, responseAsJSONString);
@@ -273,13 +280,13 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
                     .setEmail(ravePayInitializer.getEmail())
                     .setFirstname(ravePayInitializer.getfName())
                     .setLastname(ravePayInitializer.getlName())
-                    .setIP(Utils.getDeviceImei(context))
+                    .setIP(deviceIdGetter.getDeviceId())
                     .setTxRef(ravePayInitializer.getTxRef())
                     .setMeta(ravePayInitializer.getMeta())
                     .setSubAccount(ravePayInitializer.getSubAccount())
                     .setPBFPubKey(ravePayInitializer.getPublicKey())
                     .setIsPreAuth(ravePayInitializer.getIsPreAuth())
-                    .setDevice_fingerprint(Utils.getDeviceImei(context))
+                    .setDevice_fingerprint(deviceIdGetter.getDeviceId())
                     .setNarration(ravePayInitializer.getNarration());
 
             Payload body = builder.createBankTransferPayload();

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

@@ -194,5 +194,17 @@ public void setAuthurl(String authurl) {
         public void setFlwRef(String flwRef) {
             this.flwRef = flwRef;
         }
+
+        public void setNote(String note) {
+            this.note = note;
+        }
+
+        public void setBankName(String bankName) {
+            this.bankname = bankName;
+        }
+
+        public void setAccountnumber(String accountnumber) {
+            this.accountnumber = accountnumber;
+        }
     }
 }

raveandroid/src/test/java/com/flutterwave/raveandroid/account/AccountPresenterTest.java

@@ -521,7 +521,6 @@ private String generateRandomString() {
 
     private Double generateRandomDouble() {
         return new Random().nextDouble();
-
     }
 
     private Boolean generateRandomBoolean() {
@@ -576,7 +575,11 @@ private ChargeResponse generateInValidChargeResponse() {
     }
 
     private RequeryResponse generateRequerySuccessful() {
-        return new RequeryResponse();
+        RequeryResponse requeryResponse = new RequeryResponse();
+        RequeryResponse.Data data = new RequeryResponse.Data();
+        data.setChargeResponseCode("00");
+        requeryResponse.setData(data);
+        return requeryResponse;
     }
 
     private Bank generateBank(boolean internetBanking, String bankCode) {