Merge branch 'mobileMoneyHotFix'

Author: bolaware

README.md

@@ -88,7 +88,7 @@ Set the public key, encryption key and other required parameters. The `RavePayMa
 | setPublicKey(publicKey) | Merchant's public key. Get your merchant keys here for [ staging](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-staging-keys-from-the-rave-sandbox-environment) and [live](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-live-keys-from-the-rave-dashboard)| `String` | Required
 | setEncryptionKey(encryptionKey) | Merchant's encryption key. Get your merchant keys here for [ staging](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-staging-keys-from-the-rave-sandbox-environment) and [live](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-live-keys-from-the-rave-dashboard) | `String` | Required
 | setTxRef(txRef) | This is the unique reference, unique to the particular transaction being carried out. It is generated by the merchant for every transaction | `String` | Required
-| setPhoneNumber(phoneNumber) | This is the customer's phone number. | `String` | Not Required
+| setPhoneNumber(phoneNumber) | This sets the customer's phone number. This functions is also overloaded to allow you specify whether the customer can edit their phone number as such: `setPhoneNumber(phoneNumber,false)`. When set to false, the user will not be able to change the number you set here.| `String`<br/><br/>Optional overloads:<br/>`String`, `boolean` | Not Required
 | acceptAccountPayments(boolean) | Set to `true` if you want to accept payments via bank accounts, else set to `false`. | `boolean` | Not Required
 | acceptCardPayments(boolean) | Set to `true` if you want to accept payments via cards, else set to `false` | `boolean` | Not Required |
 | acceptMpesaPayments(boolean) | Set to `true` if you want to accept Mpesa payments, else set to `false` . For this option to work, you should set your country to `KE` and your currency to `KES` | `boolean` | Not Required |

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

@@ -11,6 +11,7 @@
 @Parcel
 public class RavePayInitializer {
     private final ArrayList<Integer> orderedPaymentTypesList = new ArrayList<>();
+    private boolean isPhoneEditable = true;
     String phoneNumber = "";
     private boolean saveCardFeatureAllowed = true;
     String email;
@@ -38,7 +39,7 @@ public class RavePayInitializer {
     public RavePayInitializer(String email, double amount, String publicKey,
                               String encryptionKey, String txRef, String narration,
                               String currency, String country, String fName,
-                              String lName, int theme, String phoneNumber, boolean saveCardFeatureAllowed,
+                              String lName, int theme, String phoneNumber, boolean isPhoneEditable, boolean saveCardFeatureAllowed,
                               boolean isPermanent, int duration, int frequency,
                               boolean staging, String meta, String subAccounts, String payment_plan, boolean isPreAuth,
                               boolean showStagingLabel, boolean displayFee, ArrayList<Integer> orderedPaymentTypesList) {
@@ -62,6 +63,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
         this.payment_plan = payment_plan;
         this.isPreAuth = isPreAuth;
         this.phoneNumber = phoneNumber;
+        this.isPhoneEditable = isPhoneEditable;
         this.saveCardFeatureAllowed = saveCardFeatureAllowed;
         this.showStagingLabel = showStagingLabel;
         this.displayFee = displayFee;
@@ -221,6 +223,10 @@ public boolean getIsDisplayFee() {
         return displayFee;
     }
 
+    public boolean getIsPhoneEditable() {
+        return isPhoneEditable;
+    }
+
     public void setIsDisplayFee(boolean displayFee) {
         this.displayFee = displayFee;
     }

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

@@ -58,6 +58,7 @@ public class RavePayManager {
     boolean staging = true;
     boolean isPreAuth = false;
     private String phoneNumber = "";
+    private Boolean allowEditPhone = true;
     boolean showStagingLabel = true;
     boolean displayFee = true;
     private boolean isPermanent = false;
@@ -274,6 +275,12 @@ public RavePayManager setPhoneNumber(String phoneNumber) {
         return this;
     }
 
+    public RavePayManager setPhoneNumber(String phoneNumber, Boolean isEditable) {
+        this.phoneNumber = phoneNumber;
+        this.allowEditPhone = isEditable;
+        return this;
+    }
+
     public RavePayManager setPaymentPlan(String payment_plan) {
         this.payment_plan = payment_plan;
         return this;
@@ -329,6 +336,7 @@ public RavePayInitializer createRavePayInitializer() {
                 lName,
                 theme,
                 phoneNumber,
+                allowEditPhone,
                 allowSaveCard,
                 isPermanent,
                 duration,

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

@@ -46,6 +46,8 @@ interface View {
 
         void onRequerySuccessful(RequeryResponse response, String responseAsJSONString);
 
+        void onPhoneValidated(String phoneToSet, boolean isEditable);
+
         void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap);
 
         void showFieldError(int viewID, String message, Class<?> viewtype);

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

@@ -238,6 +238,12 @@ public void onAmountValidated(String amountToSet, int visibility) {
         amountEt.setText(amountToSet);
     }
 
+    @Override
+    public void onPhoneValidated(String phoneToSet, boolean isEditable) {
+        phoneEt.setText(phoneToSet);
+        phoneEt.setEnabled(isEditable);
+    }
+
     @Override
     public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
         presenter.processTransaction(dataHashMap, ravePayInitializer);

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

@@ -489,6 +489,9 @@ public void init(RavePayInitializer ravePayInitializer) {
             } else {
                 mView.onAmountValidated("", View.VISIBLE);
             }
+            if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) {
+                mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable());
+            }
         }
     }
 

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

@@ -89,6 +89,11 @@ public void onRequerySuccessful(RequeryResponse response, String responseAsJSONS
 
     }
 
+    @Override
+    public void onPhoneValidated(String phoneToSet, boolean isEditable) {
+
+    }
+
     @Override
     public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
 

raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyContract.java

@@ -22,6 +22,8 @@ interface View {
 
         void showPollingIndicator(boolean active);
 
+        void onPhoneValidated(String phoneToSet, boolean isEditable);
+
         void showProgressIndicator(boolean active);
 
         void onAmountValidationSuccessful(String amountToPay);

raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java

@@ -159,6 +159,12 @@ public void onAmountValidationSuccessful(String amountToPay) {
         amountEt.setText(amountToPay);
     }
 
+    @Override
+    public void onPhoneValidated(String phoneToSet, boolean isEditable) {
+        phoneEt.setText(phoneToSet);
+        phoneEt.setEnabled(isEditable);
+    }
+
     @Override
     public void showProgressIndicator(boolean active) {
 

raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyPresenter.java

@@ -273,6 +273,9 @@ public void init(RavePayInitializer ravePayInitializer) {
             if (isAmountValid) {
                 mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount()));
             }
+            if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) {
+                mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable());
+            }
         }
     }