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

Author: biodunalfet

raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java

@@ -174,7 +174,7 @@ private void collectData() {
 
         dataHashMap.put(RaveConstants.fieldAmount, new ViewObject(amountTil.getId(), amountEt.getText().toString(), TextInputLayout.class));
         dataHashMap.put(RaveConstants.fieldPhone, new ViewObject(phoneTil.getId(), phoneEt.getText().toString(), TextInputLayout.class));
-        dataHashMap.put(RaveConstants.fieldNetwork, new ViewObject(networkSpinner.getId(), String.valueOf(networkSpinner.getSelectedItemPosition()), Spinner.class));
+        dataHashMap.put(RaveConstants.fieldNetwork, new ViewObject(networkSpinner.getId(), String.valueOf(networkSpinner.getSelectedItem()), Spinner.class));
 
         if (voucherTil.getVisibility() == View.VISIBLE) {
             dataHashMap.put(RaveConstants.fieldVoucher, new ViewObject(voucherTil.getId(), voucherEt.getText().toString(), TextInputLayout.class));

raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java

@@ -19,6 +19,7 @@
 import com.flutterwave.raveandroid.responses.MobileMoneyChargeResponse;
 import com.flutterwave.raveandroid.responses.RequeryResponse;
 import com.flutterwave.raveandroid.validators.AmountValidator;
+import com.flutterwave.raveandroid.validators.NetworkValidator;
 import com.flutterwave.raveandroid.validators.PhoneValidator;
 
 import java.util.HashMap;
@@ -52,6 +53,8 @@ public class GhMobileMoneyPresenter implements GhMobileMoneyContract.UserActions
     @Inject
     PhoneValidator phoneValidator;
     @Inject
+    NetworkValidator networkValidator;
+    @Inject
     DeviceIdGetter deviceIdGetter;
 
     @Inject
@@ -232,10 +235,11 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
 
         }
 
-        int network = Integer.valueOf(dataHashMap.get(fieldNetwork).getData());
+        String network = dataHashMap.get(fieldNetwork).getData();
 
         boolean isAmountValidated = amountValidator.isAmountValid(amount);
         boolean isPhoneValid = phoneValidator.isPhoneValid(phone);
+        boolean isNetworkValid = networkValidator.isNetworkValid(network);
 
         if (!isAmountValidated) {
             valid = false;
@@ -247,7 +251,7 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
             mView.showFieldError(phoneID, validPhonePrompt, phoneViewType);
         }
 
-        if (network == 0) {
+        if (!isNetworkValid) {
             valid = false;
             mView.showToast(validNetworkPrompt);
         }