changed the amount to check to the field amount

added ravepayInitializer null pointer check
replaced onPayButtonClicked to onDataCollected to conform with other payment method

Author: mikelis135

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

@@ -33,7 +33,7 @@ interface View {
     interface UserActionsListener {
         void init(RavePayInitializer ravePayInitializer);
 
-        void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amount);
+        void onDataCollected(RavePayInitializer ravePayInitializer, String amount);
 
         void chargeAccount(Payload payload, String encryptionKey, boolean isDisplayFee);
 

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

@@ -96,7 +96,7 @@ public void onClick(View view) {
         int i = view.getId();
         if (i == R.id.rave_payButton) {
             String amount = amountEt.getText().toString();
-            presenter.onPayButtonClicked(ravePayInitializer, amount);
+            presenter.onDataCollected(ravePayInitializer, amount);
         }
     }
 

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

@@ -67,11 +67,11 @@ public void init(RavePayInitializer ravePayInitializer) {
     }
 
     @Override
-    public void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amount) {
+    public void onDataCollected(RavePayInitializer ravePayInitializer, String amount) {
 
         mView.showAmountError(null);
 
-        boolean isAmountValid = amountValidator.isAmountValid(ravePayInitializer.getAmount());
+        boolean isAmountValid = amountValidator.isAmountValid(amount);
 
         if (isAmountValid) {
             mView.onValidationSuccessful(amount);
@@ -84,28 +84,31 @@ public void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amo
     @Override
     public void processTransaction(String amount, RavePayInitializer ravePayInitializer) {
 
-        ravePayInitializer.setAmount(Double.parseDouble(amount));
-        PayloadBuilder builder = new PayloadBuilder();
-        builder.setAmount(ravePayInitializer.getAmount() + "")
-                .setCountry(ravePayInitializer.getCountry())
-                .setCurrency(ravePayInitializer.getCurrency())
-                .setEmail(ravePayInitializer.getEmail())
-                .setFirstname(ravePayInitializer.getfName())
-                .setLastname(ravePayInitializer.getlName())
-                .setIP(deviceIdGetter.getDeviceId())
-                .setTxRef(ravePayInitializer.getTxRef())
-                .setMeta(ravePayInitializer.getMeta())
-                .setPBFPubKey(ravePayInitializer.getPublicKey())
-                .setIsUsBankCharge(ravePayInitializer.isWithAch())
-                .setDevice_fingerprint(deviceIdGetter.getDeviceId());
-
-        if (ravePayInitializer.getPayment_plan() != null) {
-            builder.setPaymentPlan(ravePayInitializer.getPayment_plan());
-        }
+        if (ravePayInitializer != null) {
 
-        Payload body = builder.createBankPayload();
+            ravePayInitializer.setAmount(Double.parseDouble(amount));
+            PayloadBuilder builder = new PayloadBuilder();
+            builder.setAmount(ravePayInitializer.getAmount() + "")
+                    .setCountry(ravePayInitializer.getCountry())
+                    .setCurrency(ravePayInitializer.getCurrency())
+                    .setEmail(ravePayInitializer.getEmail())
+                    .setFirstname(ravePayInitializer.getfName())
+                    .setLastname(ravePayInitializer.getlName())
+                    .setIP(deviceIdGetter.getDeviceId())
+                    .setTxRef(ravePayInitializer.getTxRef())
+                    .setMeta(ravePayInitializer.getMeta())
+                    .setPBFPubKey(ravePayInitializer.getPublicKey())
+                    .setIsUsBankCharge(ravePayInitializer.isWithAch())
+                    .setDevice_fingerprint(deviceIdGetter.getDeviceId());
+
+            if (ravePayInitializer.getPayment_plan() != null) {
+                builder.setPaymentPlan(ravePayInitializer.getPayment_plan());
+            }
 
-        chargeAccount(body, ravePayInitializer.getEncryptionKey(), ravePayInitializer.getIsDisplayFee());
+            Payload body = builder.createBankPayload();
+
+            chargeAccount(body, ravePayInitializer.getEncryptionKey(), ravePayInitializer.getIsDisplayFee());
+        }
     }