resolved conflict

Author: biodunalfet

raveandroid/build.gradle

@@ -51,6 +51,7 @@ dependencies {
     testImplementation 'com.google.dagger:dagger:2.17'
     testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.17'
     testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation 'org.mockito:mockito-inline:2.13.0'
 
 
 }

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/ach/AchPresenter.java

@@ -2,13 +2,14 @@
 
 import android.content.Context;
 
+import com.flutterwave.raveandroid.DeviceIdGetter;
+import com.flutterwave.raveandroid.GetEncryptedData;
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.PayloadBuilder;
-import com.flutterwave.raveandroid.R;
+import com.flutterwave.raveandroid.PayloadToJson;
 import com.flutterwave.raveandroid.RaveConstants;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.TransactionStatusChecker;
-import com.flutterwave.raveandroid.Utils;
 import com.flutterwave.raveandroid.card.ChargeRequestBody;
 import com.flutterwave.raveandroid.data.Callbacks;
 import com.flutterwave.raveandroid.data.NetworkRequestImpl;
@@ -23,7 +24,7 @@
 
 public class AchPresenter implements AchContract.UserActionsListener {
 
-    private Context context;
+    Context context;
     private AchContract.View mView;
 
     @Inject
@@ -35,6 +36,12 @@ public class AchPresenter implements AchContract.UserActionsListener {
     NetworkRequestImpl networkRequest;
     @Inject
     TransactionStatusChecker transactionStatusChecker;
+    @Inject
+    DeviceIdGetter deviceIdGetter;
+    @Inject
+    PayloadToJson payloadToJson;
+    @Inject
+    GetEncryptedData getEncryptedData;
 
     @Inject
     public AchPresenter(Context context, AchContract.View mView) {
@@ -69,7 +76,7 @@ public void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amo
         if (isAmountValid) {
             mView.onValidationSuccessful(amount);
         } else {
-            mView.showAmountError(context.getResources().getString(R.string.validAmountPrompt));
+            mView.showAmountError(RaveConstants.validAmountPrompt);
         }
 
     }
@@ -85,12 +92,12 @@ public void processTransaction(String amount, RavePayInitializer ravePayInitiali
                 .setEmail(ravePayInitializer.getEmail())
                 .setFirstname(ravePayInitializer.getfName())
                 .setLastname(ravePayInitializer.getlName())
-                .setIP(Utils.getDeviceImei(context))
+                .setIP(deviceIdGetter.getDeviceId())
                 .setTxRef(ravePayInitializer.getTxRef())
                 .setMeta(ravePayInitializer.getMeta())
                 .setPBFPubKey(ravePayInitializer.getPublicKey())
                 .setIsUsBankCharge(ravePayInitializer.isWithAch())
-                .setDevice_fingerprint(Utils.getDeviceImei(context));
+                .setDevice_fingerprint(deviceIdGetter.getDeviceId());
 
         if (ravePayInitializer.getPayment_plan() != null) {
             builder.setPaymentPlan(ravePayInitializer.getPayment_plan());
@@ -105,8 +112,8 @@ public void processTransaction(String amount, RavePayInitializer ravePayInitiali
     @Override
     public void chargeAccount(Payload payload, String encryptionKey, final boolean isDisplayFee) {
 
-        String requestBodyAsString = Utils.convertChargeRequestPayloadToJson(payload);
-        String accountRequestBody = Utils.getEncryptedData(requestBodyAsString, encryptionKey);
+        String requestBodyAsString = payloadToJson.convertChargeRequestPayloadToJson(payload);
+        String accountRequestBody = getEncryptedData.getEncryptedData(requestBodyAsString, encryptionKey);
 
         final ChargeRequestBody body = new ChargeRequestBody();
         body.setAlg("3DES-24");
@@ -139,7 +146,7 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
                         }
                     }
                     else {
-                        mView.onPaymentError(context.getResources().getString(R.string.no_authurl_was_returnedmsg));
+                        mView.onPaymentError(RaveConstants.no_authurl_was_returnedmsg);
                     }
 
                 }

raveandroid/src/main/java/com/flutterwave/raveandroid/data/SharedPrefsRequestImpl.java

@@ -13,18 +13,16 @@
 import java.util.List;
 
 import javax.inject.Inject;
-import javax.inject.Singleton;
 
 import static com.flutterwave.raveandroid.RaveConstants.RAVEPAY;
 
 /**
  * Created by hamzafetuga on 25/07/2017.
  */
 
-@Singleton
 public class SharedPrefsRequestImpl implements DataRequest.SharedPrefsRequest {
 
-    Context context;
+    public Context context;
     SharedPreferences sharedPreferences;
     SharedPreferences.Editor editor;
     String FLW_REF_KEY = "flw_ref_key";
@@ -81,7 +79,6 @@ public List<SavedCard> getSavedCards(String email) {
         String json = sharedPreferences.getString("SAVED_CARDS" + email, "[]");
 
         try {
-            Gson gson = new Gson();
             Type type = new TypeToken<List<SavedCard>>() {
             }.getType();
             return gson.fromJson(json, type);