Merge branch 'mikelis135-paymentValidation' of https://github.com/mikelis135/rave-android into mikelis135-mikelis135-paymentValidation

Author: biodunalfet

raveandroid/src/main/java/com/flutterwave/raveandroid/RaveConstants.java

@@ -12,11 +12,12 @@ public class RaveConstants {
     public static String PUBLIC_KEY = "FLWPUBK-e634d14d9ded04eaf05d5b63a0a06d2f-X"; //test
 //    public static String ENCRYPTION_KEY = "FLWSECK-bb971402072265fb156e90a3578fe5e6-X"; //test
     public static String ENCRYPTION_KEY = "bb9714020722eb4cf7a169f2";
-//    public static String STAGING_URL = "https://ravesandbox.azurewebsites.net";
+    //    public static String STAGING_URL = "https://ravesandbox.azurewebsites.net";
 //    public static String LIVE_URL = "https://raveapi.azurewebsites.net";
     //Todo: change back BAse URL
-public static String STAGING_URL = "https://ravesandboxapi.flutterwave.com";
+    public static String STAGING_URL = "https://ravesandboxapi.flutterwave.com";
     public static String LIVE_URL = "https://api.ravepay.co";
+
     public static String VBV = "VBVSECURECODE";
     public static String GTB_OTP = "GTB_OTP";
     public static String ACCESS_OTP = "ACCESS_OTP";

raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java

@@ -437,10 +437,9 @@ public void onRequerySuccessful(RequeryResponse response, String responseAsJSONS
     @Override
     public void onResume() {
         super.onResume();
-        if (presenter != null) {
+        if (presenter == null) {
             presenter = new AccountPresenter(getActivity(), this);
         }
-        assert presenter != null;
         presenter.onAttachView(this);
     }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/account/NullAccountView.java

@@ -1,7 +1,5 @@
 package com.flutterwave.raveandroid.account;
 
-import android.support.v4.app.Fragment;
-
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.ViewObject;
 import com.flutterwave.raveandroid.data.Bank;
@@ -14,7 +12,7 @@
  * Created by hfetuga on 06/02/2018.
  */
 
-public class NullAccountView extends Fragment implements AccountContract.View {
+public class NullAccountView implements AccountContract.View {
 
     @Override
     public void showToast(String message) {

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchContract.java

@@ -42,6 +42,10 @@ interface UserActionsListener {
         void onFeeConfirmed(String authUrl, String flwRef);
 
         void processTransaction(String amount, RavePayInitializer ravePayInitializer);
+
+        void onAttachView(View view);
+
+        void onDetachView();
     }
 
 }

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java

@@ -237,5 +237,21 @@ public void onRequerySuccessful(RequeryResponse response, String responseAsJSONS
         presenter.verifyRequeryResponse(response, responseAsJSONString, ravePayInitializer, flwRef);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (presenter == null) {
+            presenter = new AchPresenter(getActivity(), this);
+        }
+        presenter.onAttachView(this);
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        if (presenter != null) {
+            presenter.onDetachView();
+        }
+    }
 
 }

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchPresenter.java

@@ -188,4 +188,14 @@ public void verifyRequeryResponse(RequeryResponse response, String responseAsJSO
             mView.onPaymentFailed(response.getStatus(), responseAsJSONString);
         }
     }
+
+    @Override
+    public void onAttachView(AchContract.View view) {
+        this.mView = view;
+    }
+
+    @Override
+    public void onDetachView() {
+        this.mView = new NullAchView();
+    }
 }

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/NullAchView.java

@@ -0,0 +1,60 @@
+package com.flutterwave.raveandroid.ach;
+
+import com.flutterwave.raveandroid.responses.RequeryResponse;
+
+public class NullAchView implements AchContract.View {
+    @Override
+    public void showProgressIndicator(boolean active) {
+
+    }
+
+    @Override
+    public void showAmountField(boolean active) {
+
+    }
+
+    @Override
+    public void showRedirectMessage(boolean b) {
+
+    }
+
+    @Override
+    public void onPaymentError(String message) {
+
+    }
+
+    @Override
+    public void showWebView(String authUrl, String flwRef) {
+
+    }
+
+    @Override
+    public void onRequerySuccessful(RequeryResponse response, String responseAsJSONString, String flwRef) {
+
+    }
+
+    @Override
+    public void onPaymentFailed(String message, String responseAsJSONString) {
+
+    }
+
+    @Override
+    public void onPaymentSuccessful(String status, String flwRef, String responseAsJSONString) {
+
+    }
+
+    @Override
+    public void showAmountError(String msg) {
+
+    }
+
+    @Override
+    public void showFee(String authUrl, String flwRef, String chargedAmount, String currency) {
+
+    }
+
+    @Override
+    public void onValidationSuccessful(String amount) {
+
+    }
+}

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferContract.java

@@ -38,5 +38,9 @@ interface UserActionsListener {
         void startPaymentVerification();
 
         void cancelPolling();
+
+        void onAttachView(View view);
+
+        void onDetachView();
     }
 }

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java

@@ -327,4 +327,20 @@ public void onAmountValidationFailed() {
         amountTil.setVisibility(View.VISIBLE);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (presenter == null) {
+            presenter = new BankTransferPresenter(getActivity(), this);
+        }
+        presenter.onAttachView(this);
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        if (presenter != null) {
+            presenter.onDetachView();
+        }
+    }
 }

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferPresenter.java

@@ -227,7 +227,6 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
                     .setDevice_fingerprint(Utils.getDeviceImei(context))
                     .setNarration(ravePayInitializer.getNarration());
 
-
             Payload body = builder.createBankTransferPayload();
 
             if (ravePayInitializer.getIsDisplayFee()) {
@@ -238,4 +237,15 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
         }
     }
 
+    @Override
+    public void onAttachView(BankTransferContract.View view) {
+        this.mView = view;
+    }
+
+    @Override
+    public void onDetachView() {
+        this.mView = new NullBankTransferView();
+    }
+
+
 }