Improve null safety for Uk payments

jeremiahAI · jeremiahAI · commit 15c7892c4e22 · 2020-10-14T11:57:18.000+01:00
diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/uk/NullUkView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/uk/NullUkView.java
@@ -2,7 +2,6 @@
 
 import com.flutterwave.raveandroid.ViewObject;
 import com.flutterwave.raveandroid.rave_java_commons.Payload;
-import com.flutterwave.raveandroid.rave_remote.responses.ChargeResponse;
 
 import java.util.HashMap;
 
@@ -60,7 +59,8 @@ public void onPaymentSuccessful(String status, String flwRef, String responseAsS
     }
 
     @Override
-    public void showTransactionPage(ChargeResponse response) {
+    public void showTransactionPage(String amount, String paymentCode, String flwRef, String txRef) {
 
     }
+
 }
diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java
@@ -30,7 +30,6 @@
 import com.flutterwave.raveandroid.rave_java_commons.RaveConstants;
 import com.flutterwave.raveandroid.rave_logger.events.StartTypingEvent;
 import com.flutterwave.raveandroid.rave_presentation.data.events.ErrorEvent;
-import com.flutterwave.raveandroid.rave_remote.responses.ChargeResponse;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 
@@ -187,7 +186,7 @@ public void onTransactionFeeFetched(String charge_amount, final Payload payload,
         if (getActivity() != null) {
 
             AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-            builder.setMessage(getResources().getString(R.string.charge) + charge_amount + ravePayInitializer.getCurrency() + getResources().getString(R.string.askToContinue));
+            builder.setMessage(getResources().getString(R.string.charge) + " " + charge_amount + " " + ravePayInitializer.getCurrency() + getResources().getString(R.string.askToContinue));
             builder.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
@@ -219,23 +218,23 @@ public void showToast(String message) {
     }
 
     @Override
-    public void showTransactionPage(final ChargeResponse response) {
+    public void showTransactionPage(String amount, String paymentCode, final String flwRef, final String txRef) {
 
         if (getContext() != null) {
             final Dialog dialog = new Dialog(getContext());
             dialog.setContentView(R.layout.rave_sdk_ukinstruction_layout);
             dialog.setTitle("Flutterwave");
             presenter.logEvent(new InstructionsDisplayedEvent("UK").getEvent(), ravePayInitializer.getPublicKey());
 
-            ((TextView) dialog.findViewById(R.id.amount)).setText(String.format("%s %s", "GBP", response.getData().getData().getAmount()));
+            ((TextView) dialog.findViewById(R.id.amount)).setText(String.format("%s %s", "GBP", amount));
             ((TextView) dialog.findViewById(R.id.accountNumber)).setText(getString(R.string.flutterwave_ukaccount));
             ((TextView) dialog.findViewById(R.id.sortCode)).setText(getString(R.string.flutterwave_sortcode));
-            ((TextView) dialog.findViewById(R.id.reference)).setText(response.getData().getData().getPayment_code());
+            ((TextView) dialog.findViewById(R.id.reference)).setText(amount);
 
             dialog.findViewById(R.id.ukPaymentButton).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    presenter.requeryTx(response.getData().getData().getFlw_reference(), response.getData().getData().getTransaction_reference(), ravePayInitializer.getPublicKey());
+                    presenter.requeryTx(flwRef, txRef, ravePayInitializer.getPublicKey());
                 }
             });
             dialog.show();
diff --git a/rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/uk/UkContract.java b/rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/uk/UkContract.java
@@ -2,7 +2,6 @@
 
 import com.flutterwave.raveandroid.rave_java_commons.Payload;
 import com.flutterwave.raveandroid.rave_logger.Event;
-import com.flutterwave.raveandroid.rave_remote.responses.ChargeResponse;
 
 
 public interface UkContract {
@@ -22,7 +21,7 @@ interface Interactor {
 
         void onPaymentSuccessful(String status, String flwRef, String responseAsString);
 
-        void showTransactionPage(ChargeResponse response);
+        void showTransactionPage(String amount, String paymentCode, String flwRef, String txRef);
     }
 
     interface Handler {
diff --git a/rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/uk/UkHandler.java b/rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/uk/UkHandler.java
@@ -40,6 +40,7 @@ public class UkHandler implements UkContract.Handler {
     PayloadEncryptor payloadEncryptor;
     private UkContract.Interactor mInteractor;
     private boolean pollingCancelled = false;
+    String txRef = null;
 
     @Inject
     public UkHandler(UkContract.Interactor mInteractor) {
@@ -79,6 +80,8 @@ public void onError(String message) {
 
     @Override
     public void chargeUk(final Payload payload, final String encryptionKey) {
+        txRef = payload.getTxRef();
+
         String cardRequestBodyAsString = Utils.convertChargeRequestPayloadToJson(payload);
         String encryptedCardRequestBody = payloadEncryptor.getEncryptedData(cardRequestBodyAsString, encryptionKey);
         encryptedCardRequestBody = encryptedCardRequestBody.trim();
@@ -101,7 +104,10 @@ public void onSuccess(ChargeResponse response) {
                 mInteractor.showProgressIndicator(false);
 
                 if (response.getData() != null) {
-                    mInteractor.showTransactionPage(response);
+                    String amount = response.getAmount();
+                    String paymentCode = response.getPaymentCode();
+                    String flwRef = response.getFlwRef();
+                    mInteractor.showTransactionPage(amount, paymentCode, flwRef, txRef);
                 } else {
                     mInteractor.onPaymentError(noResponse);
                 }
diff --git a/rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/uk/UkInteractorImpl.java b/rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/uk/UkInteractorImpl.java
@@ -3,7 +3,6 @@
 import com.flutterwave.raveandroid.rave_java_commons.Payload;
 import com.flutterwave.raveandroid.rave_presentation.FeeCheckListener;
 import com.flutterwave.raveandroid.rave_presentation.NullFeeCheckListener;
-import com.flutterwave.raveandroid.rave_remote.responses.ChargeResponse;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
@@ -57,16 +56,16 @@ public void onPaymentSuccessful(String status, String flwRef, String responseAsS
     }
 
     @Override
-    public void showTransactionPage(ChargeResponse response) {
+    public void showTransactionPage(String amount, String paymentCode, final String flwRef, final String txRef) {
         callback.showTransactionDetails(
-                response.getData().getAmount(),
+                amount,
                 FLUTTERWAVE_UK_ACCOUNT,
                 FLUTTERWAVE_UK_SORT_CODE,
                 FLUTTERWAVE_UK_BENEFICIARY_NAME,
-                response.getData().getData().getPayment_code()
+                paymentCode
         );
-        this.flwRef = response.getData().getData().getFlw_reference();
-        this.txRef = response.getData().getData().getTransaction_reference();
+        this.flwRef = flwRef;
+        this.txRef = txRef;
     }
 
     @Override
diff --git a/rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/responses/ChargeResponse.java b/rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/responses/ChargeResponse.java
@@ -34,6 +34,21 @@ public void setData(Data data) {
         this.data = data;
     }
 
+    public String getAmount() {
+        return data == null ? null : data.amount;
+    }
+
+    public String getPaymentCode() {
+        return data == null ? null : data.payment_code;
+    }
+
+    public String getFlwRef() {
+        return (data == null) ? null : data.getFlwRef();
+    }
+
+    public String getTxRef() {
+        return (data == null) ? null : data.getTx_ref();
+    }
 
     public static class AccountValidateInstructions {
         public String getInstruction() {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import com.flutterwave.raveandroid.ViewObject;`
`4`	`4`	`import com.flutterwave.raveandroid.rave_java_commons.Payload;`
`5`		`-import com.flutterwave.raveandroid.rave_remote.responses.ChargeResponse;`
`6`	`5`
`7`	`6`	`import java.util.HashMap;`
`8`	`7`
`@@ -60,7 +59,8 @@ public void onPaymentSuccessful(String status, String flwRef, String responseAsS`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`@Override`
`63`		`- public void showTransactionPage(ChargeResponse response) {`
	`62`	`+ public void showTransactionPage(String amount, String paymentCode, String flwRef, String txRef) {`
`64`	`63`
`65`	`64`	`}`
	`65`	`+`
`66`	`66`	`}`