Parse correct account details and sort code

jeremiahAI · jeremiahAI · commit 61fa94b94c02 · 2021-01-15T10:51:04.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
@@ -59,7 +59,7 @@ public void onPaymentSuccessful(String status, String flwRef, String responseAsS
     }
 
     @Override
-    public void showTransactionPage(String amount, String paymentCode, String flwRef, String txRef) {
+    public void showTransactionPage(String amount, String paymentCode, String accountNumber, String sortCode, 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
@@ -218,7 +218,7 @@ public void showToast(String message) {
     }
 
     @Override
-    public void showTransactionPage(String amount, String paymentCode, final String flwRef, final String txRef) {
+    public void showTransactionPage(String amount, String paymentCode, String accountNumber, String sortCode, final String flwRef, final String txRef) {
 
         if (getContext() != null) {
             final Dialog dialog = new Dialog(getContext());
@@ -227,8 +227,9 @@ public void showTransactionPage(String amount, String paymentCode, final String
             presenter.logEvent(new InstructionsDisplayedEvent("UK").getEvent(), ravePayInitializer.getPublicKey());
 
             ((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.accountNumber)).setText(
+                    accountNumber != null ? accountNumber : getString(R.string.flutterwave_ukaccount));
+            ((TextView) dialog.findViewById(R.id.sortCode)).setText(sortCode != null ? sortCode : getString(R.string.flutterwave_sortcode));
             ((TextView) dialog.findViewById(R.id.reference)).setText(paymentCode);
 
             dialog.findViewById(R.id.ukPaymentButton).setOnClickListener(new View.OnClickListener() {
diff --git a/rave_android/src/main/res/values/strings.xml b/rave_android/src/main/res/values/strings.xml
@@ -155,9 +155,9 @@
 
     <string name="uk_instruction">Please complete this transaction on your Mobile Banking App or Online Banking Platform using the following details</string>
     <string name="i_have_completed_this_payment">I have completed this payment  → </string>
-    <string name="flutterwave_ukaccount">4327122</string>
+    <string name="flutterwave_ukaccount">43271228</string>
     <string name="flutterwave_sortcode">04-00-53</string>
-    <string name="barter_funnding">Barter Funnding</string>
+    <string name="barter_funnding">Barter Funding</string>
 
     <string name="reference_code">Reference Code</string>
     <string name="reference_code_placeholder">4990</string>
diff --git a/rave_java_commons/src/main/java/com/flutterwave/raveandroid/rave_java_commons/RaveConstants.java b/rave_java_commons/src/main/java/com/flutterwave/raveandroid/rave_java_commons/RaveConstants.java
@@ -33,7 +33,7 @@ public class RaveConstants {
     public static String STAGING_URL = "https://ravesandboxapi.flutterwave.com";
     public static String LIVE_URL = "https://api.ravepay.co";
     public static String EVENT_LOGGING_URL = "https://kgelfdz7mf.execute-api.us-east-1.amazonaws.com/";
-    public static String FLUTTERWAVE_UK_ACCOUNT = "4327122";
+    public static String FLUTTERWAVE_UK_ACCOUNT = "43271228";
     public static String FLUTTERWAVE_UK_SORT_CODE = "04-00-53";
     public static String FLUTTERWAVE_UK_BENEFICIARY_NAME = "Barter Funding";
 
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
@@ -21,7 +21,7 @@ interface Interactor {
 
         void onPaymentSuccessful(String status, String flwRef, String responseAsString);
 
-        void showTransactionPage(String amount, String paymentCode, String flwRef, String txRef);
+        void showTransactionPage(String amount, String paymentCode, String accountNumber, String sortCode, 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
@@ -108,9 +108,11 @@ public void onSuccess(ChargeResponse response) {
                     String amount = response.getAmount();
                     String paymentCode = response.getPaymentCode();
                     String flwRef = response.getFlwRef();
+                    String accountNumber = response.getAccountNumber();
+                    String sortCode = response.getSortCode();
                     if (amount != null && paymentCode != null) {
                         mInteractor.showProgressIndicator(false);
-                        mInteractor.showTransactionPage(amount, paymentCode, flwRef, txRef);
+                        mInteractor.showTransactionPage(amount, paymentCode, accountNumber, sortCode, flwRef, txRef);
                     } else if (response.getPingUrl() != null) {
                         callPingUrl(response.getPingUrl());
                     } else {
@@ -145,8 +147,10 @@ public void onSuccess(PollingResponse response) {
                         String amount = response.getAmount();
                         String paymentCode = response.getPaymentCode();
                         String flwRef = response.getFlwRef();
+                        String accountNumber = response.getAccountNumber();
+                        String sortCode = response.getSortCode();
                         if (amount != null && paymentCode != null)
-                            mInteractor.showTransactionPage(amount, paymentCode, flwRef, txRef);
+                            mInteractor.showTransactionPage(amount, paymentCode, accountNumber, sortCode, flwRef, txRef);
                         else mInteractor.onPaymentError(noResponse);
                     } else callPingUrl(pingUrl);
                 } else {
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
@@ -56,11 +56,11 @@ public void onPaymentSuccessful(String status, String flwRef, String responseAsS
     }
 
     @Override
-    public void showTransactionPage(String amount, String paymentCode, final String flwRef, final String txRef) {
+    public void showTransactionPage(String amount, String paymentCode, String accountNumber, String sortCode, final String flwRef, final String txRef) {
         callback.showTransactionDetails(
                 amount,
-                FLUTTERWAVE_UK_ACCOUNT,
-                FLUTTERWAVE_UK_SORT_CODE,
+                accountNumber != null ? accountNumber : FLUTTERWAVE_UK_ACCOUNT,
+                sortCode != null ? sortCode : FLUTTERWAVE_UK_SORT_CODE,
                 FLUTTERWAVE_UK_BENEFICIARY_NAME,
                 paymentCode
         );
diff --git a/rave_remote/build.gradle b/rave_remote/build.gradle
@@ -44,6 +44,7 @@ dependencies {
 
     //dagger
     implementation 'com.google.dagger:dagger:2.27'
+    implementation 'org.jetbrains:annotations-java5:15.0'
     annotationProcessor 'com.google.dagger:dagger-compiler:2.27'
 
     testImplementation 'junit:junit:4.12'
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
@@ -1,5 +1,9 @@
 package com.flutterwave.raveandroid.rave_remote.responses;
 
+import androidx.annotation.Nullable;
+
+import com.google.gson.JsonObject;
+
 /**
  * Created by hamzafetuga on 18/07/2017.
  */
@@ -42,6 +46,28 @@ public String getPaymentCode() {
         return data.getData() == null ? null : data.getData().payment_code;
     }
 
+    @Nullable
+    private JsonObject getMeta() {
+        return data.getData() == null ? null : data.getData().meta_data;
+    }
+
+    public String getAccountNumber() {
+        try {
+            return getMeta() == null ? null : getMeta().get("account_number").getAsString();
+        } catch (Exception ignored) {
+            return null;
+        }
+    }
+
+    public String getSortCode() {
+        try {
+            return getMeta() == null ? null : getMeta().get("sort_code").getAsString();
+        } catch (Exception ignored) {
+            return null;
+        }
+    }
+
+
     public String getFlwRef() {
         return (data.getData() == null) ? null : data.getData().getFlwRef();
     }
@@ -69,6 +95,7 @@ public void setInstruction(String instruction) {
 
     public static class Data {
 
+        JsonObject meta_data;
         String ping_url;
         Data data;
         String suggested_auth;
diff --git a/rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/responses/PollingResponse.java b/rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/responses/PollingResponse.java
@@ -20,6 +20,15 @@ public String getFlwRef() {
         return (getResponse() == null) ? null : getResponse().getFlwRef();
     }
 
+    public String getAccountNumber() {
+        return (getResponse() == null) ? null : getResponse().getAccountNumber();
+    }
+
+    public String getSortCode() {
+        return (getResponse() == null) ? null : getResponse().getSortCode();
+    }
+
+
     class Data {
         ChargeResponse response_parsed;
     }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public void onPaymentSuccessful(String status, String flwRef, String responseAsS`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
`62`		`- public void showTransactionPage(String amount, String paymentCode, String flwRef, String txRef) {`
	`62`	`+ public void showTransactionPage(String amount, String paymentCode, String accountNumber, String sortCode, String flwRef, String txRef) {`
`63`	`63`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ interface Interactor {`
`21`	`21`
`22`	`22`	`void onPaymentSuccessful(String status, String flwRef, String responseAsString);`
`23`	`23`
`24`		`- void showTransactionPage(String amount, String paymentCode, String flwRef, String txRef);`
	`24`	`+ void showTransactionPage(String amount, String paymentCode, String accountNumber, String sortCode, String flwRef, String txRef);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`interface Handler {`