removed all hard references to ravePayInitializer from the presenter for both accounts and card

biodunalfet · biodunalfet · commit 2ec7b6ca197a · 2018-02-19T11:45:02.000+01:00
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountContract.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountContract.java
@@ -4,6 +4,7 @@
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.card.CardContract;
 import com.flutterwave.raveandroid.data.Bank;
+import com.flutterwave.raveandroid.responses.RequeryResponse;
 
 import java.util.List;
 
@@ -39,6 +40,8 @@ interface View {
         void displayFee(String charge_amount, Payload payload, boolean internetbanking);
 
         void showFetchFeeFailed(String s);
+
+        void onRequerySuccessful(RequeryResponse response, String responseAsJSONString);
     }
 
     interface UserActionsListener {
@@ -53,6 +56,8 @@ interface UserActionsListener {
         void onAttachView(AccountContract.View view);
 
         void onDetachView();
+
+        void verifyRequeryResponseStatus(RequeryResponse response, String responseAsJSONString);
     }
 
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java
@@ -42,6 +42,7 @@
 import com.flutterwave.raveandroid.card.CardPresenter;
 import com.flutterwave.raveandroid.data.Bank;
 import com.flutterwave.raveandroid.data.Callbacks;
+import com.flutterwave.raveandroid.responses.RequeryResponse;
 
 import java.util.Calendar;
 import java.util.List;
@@ -452,6 +453,10 @@ public void onPaymentError(String message) {
         showToast(message);
     }
 
+    @Override
+    public void onRequerySuccessful(RequeryResponse response, String responseAsJSONString) {
+        presenter.verifyRequeryResponseStatus(response, responseAsJSONString);
+    }
 
     @Override
     public void displayFee(String charge_amount, final Payload payload, final boolean internetbanking) {
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountPresenter.java
@@ -184,18 +184,8 @@ public void requeryTx(String flwRef, String SECKEY) {
         new NetworkRequestImpl().requeryTx(body, new Callbacks.OnRequeryRequestComplete() {
             @Override
             public void onSuccess(RequeryResponse response, String responseAsJSONString) {
-
-                RavePayInitializer ravePayInitializer = ((RavePayActivity) context).getRavePayInitializer();
-                boolean wasTxSuccessful = Utils.wasTxSuccessful(ravePayInitializer, responseAsJSONString);
-
                 mView.showProgressIndicator(false);
-
-                if (wasTxSuccessful) {
-                    mView.onPaymentSuccessful(response.getStatus(), responseAsJSONString);
-                }
-                else {
-                    mView.onPaymentFailed(response.getStatus(), responseAsJSONString);
-                }
+                mView.onRequerySuccessful(response, responseAsJSONString);
             }
 
             @Override
@@ -206,6 +196,22 @@ public void onError(String message, String responseAsJSONString) {
         });
     }
 
+    @Override
+    public void verifyRequeryResponseStatus(RequeryResponse response, String responseAsJSONString) {
+        mView.showProgressIndicator(true);
+        RavePayInitializer ravePayInitializer = ((RavePayActivity) context).getRavePayInitializer();
+        boolean wasTxSuccessful = Utils.wasTxSuccessful(ravePayInitializer, responseAsJSONString);
+
+        mView.showProgressIndicator(false);
+
+        if (wasTxSuccessful) {
+            mView.onPaymentSuccessful(response.getStatus(), responseAsJSONString);
+        }
+        else {
+            mView.onPaymentFailed(response.getStatus(), responseAsJSONString);
+        }
+    }
+
     @Override
     public void onAttachView(AccountContract.View view) {
         this.mView = view;
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/NullAccountView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/NullAccountView.java
@@ -4,6 +4,7 @@
 
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.data.Bank;
+import com.flutterwave.raveandroid.responses.RequeryResponse;
 
 import java.util.List;
 
@@ -82,4 +83,9 @@ public void displayFee(String charge_amount, Payload payload, boolean internetba
     public void showFetchFeeFailed(String s) {
 
     }
+
+    @Override
+    public void onRequerySuccessful(RequeryResponse response, String responseAsJSONString) {
+
+    }
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardContract.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardContract.java
@@ -2,8 +2,10 @@
 
 
 import com.flutterwave.raveandroid.Payload;
+import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.data.SavedCard;
 import com.flutterwave.raveandroid.responses.ChargeResponse;
+import com.flutterwave.raveandroid.responses.RequeryResponse;
 
 import java.util.List;
 
@@ -56,6 +58,8 @@ interface View {
         void onAVSVBVSecureCodeModelUsed(String authurl, String flwRef);
 
         void onValidateCardChargeFailed(String flwRef, String responseAsJSON);
+
+        void onRequerySuccessful(RequeryResponse response, String responseAsJSONString, String flwRef);
     }
 
     interface UserActionsListener {
@@ -84,6 +88,8 @@ interface UserActionsListener {
         void onAttachView(CardContract.View view);
 
         void onDetachView();
+
+        void verifyRequeryResponse(RequeryResponse response, String responseAsJSONString, RavePayInitializer ravePayInitializer, String flwRef);
     }
 
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java
@@ -43,6 +43,7 @@
 import com.flutterwave.raveandroid.data.Callbacks;
 import com.flutterwave.raveandroid.data.SavedCard;
 import com.flutterwave.raveandroid.responses.ChargeResponse;
+import com.flutterwave.raveandroid.responses.RequeryResponse;
 
 import java.util.List;
 import java.util.regex.Matcher;
@@ -527,6 +528,11 @@ public void onVBVAuthModelUsed(String authUrlCrude, String flwRef) {
 
     }
 
+    @Override
+    public void onRequerySuccessful(RequeryResponse response, String responseAsJSONString, String flwRef) {
+        presenter.verifyRequeryResponse(response, responseAsJSONString, ravePayInitializer, flwRef);
+    }
+
     /**
      *
      * Called after a successful transaction occurs. It closes all open dialogs
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardPresenter.java
@@ -10,7 +10,6 @@
 import com.flutterwave.raveandroid.RavePayActivity;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.Utils;
-import com.flutterwave.raveandroid.account.NullAccountView;
 import com.flutterwave.raveandroid.data.Callbacks;
 import com.flutterwave.raveandroid.data.CardDetsToSave;
 import com.flutterwave.raveandroid.data.NetworkRequestImpl;
@@ -225,16 +224,8 @@ public void requeryTx(final String flwRef, final String SECKEY, final boolean sh
             @Override
             public void onSuccess(RequeryResponse response, String responseAsJSONString) {
 
-                RavePayInitializer ravePayInitializer = ((RavePayActivity) context).getRavePayInitializer();
-                boolean wasTxSuccessful = Utils.wasTxSuccessful(ravePayInitializer, responseAsJSONString);
-                mView.showFullProgressIndicator(false);
-
-                if (wasTxSuccessful) {
-                    mView.onPaymentSuccessful(response.getStatus(), flwRef, responseAsJSONString);
-                }
-                else {
-                    mView.onPaymentFailed(response.getStatus(), responseAsJSONString);
-                }
+                mView.showProgressIndicator(false);
+                mView.onRequerySuccessful(response, responseAsJSONString, flwRef);
             }
 
             @Override
@@ -245,6 +236,20 @@ public void onError(String message, String responseAsJSONString) {
         });
     }
 
+    @Override
+    public void verifyRequeryResponse(RequeryResponse response, String responseAsJSONString, RavePayInitializer ravePayInitializer, String flwRef) {
+        mView.showProgressIndicator(true);
+        boolean wasTxSuccessful = Utils.wasTxSuccessful(ravePayInitializer, responseAsJSONString);
+        mView.showFullProgressIndicator(false);
+
+        if (wasTxSuccessful) {
+            mView.onPaymentSuccessful(response.getStatus(), flwRef, responseAsJSONString);
+        }
+        else {
+            mView.onPaymentFailed(response.getStatus(), responseAsJSONString);
+        }
+    }
+
     @Override
     public void savePotentialCardDets(String cardFirst6, String cardLast4) {
         new SharedPrefsRequestImpl(context).saveCardDetsToSave(new CardDetsToSave(cardFirst6, cardLast4));
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/NullCardView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/NullCardView.java
@@ -6,6 +6,7 @@
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.data.SavedCard;
 import com.flutterwave.raveandroid.responses.ChargeResponse;
+import com.flutterwave.raveandroid.responses.RequeryResponse;
 
 import java.util.List;
 
@@ -129,4 +130,9 @@ public void onAVSVBVSecureCodeModelUsed(String authurl, String flwRef) {
     public void onValidateCardChargeFailed(String flwRef, String responseAsJSON) {
 
     }
+
+    @Override
+    public void onRequerySuccessful(RequeryResponse response, String responseAsJSONString, String flwRef) {
+
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import com.flutterwave.raveandroid.Payload;`
`5`	`5`	`import com.flutterwave.raveandroid.card.CardContract;`
`6`	`6`	`import com.flutterwave.raveandroid.data.Bank;`
	`7`	`+import com.flutterwave.raveandroid.responses.RequeryResponse;`
`7`	`8`
`8`	`9`	`import java.util.List;`
`9`	`10`
`@@ -39,6 +40,8 @@ interface View {`
`39`	`40`	`void displayFee(String charge_amount, Payload payload, boolean internetbanking);`
`40`	`41`
`41`	`42`	`void showFetchFeeFailed(String s);`
	`43`	`+`
	`44`	`+ void onRequerySuccessful(RequeryResponse response, String responseAsJSONString);`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`interface UserActionsListener {`
`@@ -53,6 +56,8 @@ interface UserActionsListener {`
`53`	`56`	`void onAttachView(AccountContract.View view);`
`54`	`57`
`55`	`58`	`void onDetachView();`
	`59`	`+`
	`60`	`+ void verifyRequeryResponseStatus(RequeryResponse response, String responseAsJSONString);`
`56`	`61`	`}`
`57`	`62`
`58`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@`
`2`	`2`
`3`	`3`
`4`	`4`	`import com.flutterwave.raveandroid.Payload;`
	`5`	`+import com.flutterwave.raveandroid.RavePayInitializer;`
`5`	`6`	`import com.flutterwave.raveandroid.data.SavedCard;`
`6`	`7`	`import com.flutterwave.raveandroid.responses.ChargeResponse;`
	`8`	`+import com.flutterwave.raveandroid.responses.RequeryResponse;`
`7`	`9`
`8`	`10`	`import java.util.List;`
`9`	`11`
`@@ -56,6 +58,8 @@ interface View {`
`56`	`58`	`void onAVSVBVSecureCodeModelUsed(String authurl, String flwRef);`
`57`	`59`
`58`	`60`	`void onValidateCardChargeFailed(String flwRef, String responseAsJSON);`
	`61`	`+`
	`62`	`+ void onRequerySuccessful(RequeryResponse response, String responseAsJSONString, String flwRef);`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`interface UserActionsListener {`
`@@ -84,6 +88,8 @@ interface UserActionsListener {`
`84`	`88`	`void onAttachView(CardContract.View view);`
`85`	`89`
`86`	`90`	`void onDetachView();`
	`91`	`+`
	`92`	`+ void verifyRequeryResponse(RequeryResponse response, String responseAsJSONString, RavePayInitializer ravePayInitializer, String flwRef);`
`87`	`93`	`}`
`88`	`94`
`89`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import com.flutterwave.raveandroid.Payload;`
`7`	`7`	`import com.flutterwave.raveandroid.data.SavedCard;`
`8`	`8`	`import com.flutterwave.raveandroid.responses.ChargeResponse;`
	`9`	`+import com.flutterwave.raveandroid.responses.RequeryResponse;`
`9`	`10`
`10`	`11`	`import java.util.List;`
`11`	`12`
`@@ -129,4 +130,9 @@ public void onAVSVBVSecureCodeModelUsed(String authurl, String flwRef) {`
`129`	`130`	`public void onValidateCardChargeFailed(String flwRef, String responseAsJSON) {`
`130`	`131`
`131`	`132`	`}`
	`133`	`+`
	`134`	`+ @Override`
	`135`	`+ public void onRequerySuccessful(RequeryResponse response, String responseAsJSONString, String flwRef) {`
	`136`	`+`
	`137`	`+ }`
`132`	`138`	`}`