Pass Device ID to BaseRequestBody via a constructor call.

michael-paystack · michael-paystack · commit d2a2a13366ec · 2021-05-16T10:02:48.000+01:00
Signed-off-by: Michael obi &lt;michael@paystack.com&gt;
diff --git a/paystack/src/main/java/co/paystack/android/TransactionManager.java b/paystack/src/main/java/co/paystack/android/TransactionManager.java
@@ -4,6 +4,7 @@
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.CountDownTimer;
+import android.provider.Settings;
 import android.util.Log;
 
 import java.security.KeyManagementException;
@@ -83,8 +84,9 @@ private void initiate() throws ProcessingException {
             throw new ProcessingException();
         }
         setProcessingOn();
-        chargeRequestBody = new ChargeRequestBody(charge);
-        validateRequestBody = new ValidateRequestBody();
+        String deviceId = "androidsdk_" + Settings.Secure.getString(activity.getContentResolver(), Settings.Secure.ANDROID_ID);
+        chargeRequestBody = new ChargeRequestBody(charge, deviceId);
+        validateRequestBody = new ValidateRequestBody(deviceId);
     }
 
     void chargeCard(Activity activity, Charge charge, Paystack.TransactionCallback transactionCallback) {
diff --git a/paystack/src/main/java/co/paystack/android/api/request/BaseRequestBody.java b/paystack/src/main/java/co/paystack/android/api/request/BaseRequestBody.java
@@ -1,13 +1,9 @@
 package co.paystack.android.api.request;
 
-import android.provider.Settings;
-
 import com.google.gson.annotations.SerializedName;
 
 import java.util.HashMap;
 
-import co.paystack.android.PaystackSdk;
-
 /**
  * A base for all request bodies
  */
@@ -18,9 +14,9 @@ abstract class BaseRequestBody {
 
     public abstract HashMap<String, String> getParamsHashMap();
 
-    void setDeviceId() {
-        this.device = "androidsdk_" + Settings.Secure.getString(PaystackSdk.applicationContext.getContentResolver(),
-                Settings.Secure.ANDROID_ID);
+    protected BaseRequestBody(String deviceId) {
+        this.device = deviceId;
     }
 
+
 }
diff --git a/paystack/src/main/java/co/paystack/android/api/request/ChargeRequestBody.java b/paystack/src/main/java/co/paystack/android/api/request/ChargeRequestBody.java
@@ -72,8 +72,8 @@ public class ChargeRequestBody extends BaseRequestBody {
     private String plan;
     private HashMap<String, String> additionalParameters;
 
-    public ChargeRequestBody(Charge charge) {
-        this.setDeviceId();
+    public ChargeRequestBody(Charge charge, String deviceId) {
+        super(deviceId);
         this.clientData = Crypto.encrypt(StringUtils.concatenateCardFields(charge.getCard()));
         this.last4 = charge.getCard().getLast4digits();
         this.public_key = PaystackSdk.getPublicKey();
diff --git a/paystack/src/main/java/co/paystack/android/api/request/ValidateRequestBody.java b/paystack/src/main/java/co/paystack/android/api/request/ValidateRequestBody.java
@@ -16,8 +16,8 @@ public class ValidateRequestBody extends BaseRequestBody implements Serializable
     @SerializedName(FIELD_TOKEN)
     private String token;
 
-    public ValidateRequestBody() {
-        this.setDeviceId();
+    public ValidateRequestBody(String deviceId) {
+        super(deviceId);
     }
 
     private String getTrans() {

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ public class ValidateRequestBody extends BaseRequestBody implements Serializable`
`16`	`16`	`@SerializedName(FIELD_TOKEN)`
`17`	`17`	`private String token;`
`18`	`18`
`19`		`- public ValidateRequestBody() {`
`20`		`- this.setDeviceId();`
	`19`	`+ public ValidateRequestBody(String deviceId) {`
	`20`	`+ super(deviceId);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`private String getTrans() {`