Merge branch 'master' into pay_with_bank

# Conflicts:
#	raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java
#	raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java
#	raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java
#	raveandroid/src/main/res/values/strings.xml

Author: jeremiahAI

README.md

@@ -36,7 +36,6 @@ The minimum supported SDK version is 15
 Add the `READ_PHONE_PERMISSION` and `INTERNET` permissions to your android manifest
 
      <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-     <uses-permission android:name="android.Manifest.permission.READ_PHONE_STATE" />
      <uses-permission android:name="android.permission.INTERNET" />
 
 > **REQUIRED PERMISSION**

app/src/main/java/com/flutterwave/rave_android/MainActivity.java

@@ -1,9 +1,9 @@
 package com.flutterwave.rave_android;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.support.v7.widget.SwitchCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -158,7 +158,7 @@ private void validateEntries() {
             amount = "0";
         }
 
-        //check for compulsory fields
+        //isAmountValid for compulsory fields
         if (!Utils.isEmailValid(email)) {
             valid = false;
             emailEt.setError("A valid email is required");
@@ -278,7 +278,7 @@ public void onClick(View view) {
         addVendorBtn.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View view) {
-                Boolean valid = true;
+                boolean valid = true;
                 String vendorRef = vendorReferenceET.getText().toString().trim();
                 String vendorRatio = vendorRatioET.getText().toString().trim();
 

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

@@ -30,4 +30,54 @@ public class RaveConstants {
     public static int RAVE_REQUEST_CODE = 4199;
     public static int MANUAL_CARD_CHARGE = 403;
     public static int TOKEN_CHARGE = 24;
+    public static String fieldAmount = "amount";
+    public static String fieldPhone = "phone";
+    public static String fieldEmail = "email";
+    public static String fieldAccount = "account";
+    public static String fieldVoucher = "voucher";
+    public static String fieldNetwork = "network";
+    public static String fieldBVN = "bvn";
+    public static String fieldDOB = "dob";
+    public static String fieldBankCode = "bankcode";
+    public static String fieldCvv = "cvv";
+    public static String fieldCardExpiry = "cardExpiry";
+    public static String fieldcardNoStripped = "cardNoStripped";
+    public static String date_of_birth = "Date of Birth";
+    public static String isInternetBanking = "bankcode";
+
+    public static String success = "success";
+    public static String noResponse = "No response data was returned";
+
+    public static String response = "response";
+    public static String mtn = "mtn";
+    public static String tigo = "tigo";
+    public static String vodafone = "vodafone";
+
+    public static String tokenNotFound = "token not found";
+    public static String expired = "expired";
+    public static String tokenExpired = "Token expired";
+    public static String cardNoStripped = "cardNoStripped";
+    public static String validAmountPrompt = "Enter a valid amount";
+    public static String validPhonePrompt = "Enter a valid number";
+    public static String validEmailPrompt = "Enter a valid Email";
+    public static String charge = "You will be charged a total of";
+    public static String askToContinue = ". Do you want to continue?";
+    public static String yes = "YES";
+    public static String no = "NO";
+    public static String cancel = "CANCEL";
+    public static String checkStatus = "Checking transaction status.  Please wait";
+    public static String transactionError = "An error occurred while retrieving transaction fee";
+    public static String validCvvPrompt = "Enter a valid cvv";
+    public static String validExpiryDatePrompt = "Enter a valid expiry date";
+    public static String validCreditCardPrompt = "Enter a valid credit card number";
+    public static String validVoucherPrompt = "Enter a valid voucher code";
+    public static String validNetworkPrompt = "Select a network";
+    public static String invalidChargeCode = "Invalid charge response code";
+    public static String invalidCharge = "Invalid charge card response";
+    public static String unknownAuthmsg = "Unknown Auth Model";
+    public static String unknownResCodemsg = "Unknown charge response code";
+    public static String no_authurl_was_returnedmsg = "No authUrl was returned";
+    public static String no_response_data_was_returnedmsg = "No response data was returned";
+    public static String wait = "Please wait...";
+    public static String cancelPayment = "CANCEL PAYMENT";
 }

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

@@ -2,8 +2,6 @@
 
 import org.parceler.Parcel;
 
-import java.util.List;
-
 /**
  * Created by hamzafetuga on 21/07/2017.
  */
@@ -246,7 +244,9 @@ public void setPayment_plan(String payment_plan) {
         this.payment_plan = payment_plan;
     }
 
-    public void setPreAuth( Boolean isPreAuth){ this.isPreAuth = isPreAuth; }
+    public void setPreAuth(boolean isPreAuth) {
+        this.isPreAuth = isPreAuth;
+    }
 
     public boolean getIsPreAuth() { return  isPreAuth; }
 

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

@@ -112,7 +112,7 @@ public RavePayManager setSubAccounts(List<SubAccount> subAccounts){
         return this;
     }
 
-    public RavePayManager showStagingLabel(Boolean showStagingLabel){
+    public RavePayManager showStagingLabel(boolean showStagingLabel) {
         this.showStagingLabel = showStagingLabel;
         return this;
     }
@@ -187,7 +187,7 @@ public void initialize() {
         }
     }
 
-    public RavePayManager shouldDisplayFee(Boolean displayFee){
+    public RavePayManager shouldDisplayFee(boolean displayFee) {
         this.displayFee = displayFee;
         return this;
     }

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

@@ -19,20 +19,15 @@
 
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.KeyFactory;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.security.PublicKey;
-import java.security.spec.MGF1ParameterSpec;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.List;
 
 import javax.crypto.Cipher;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.OAEPParameterSpec;
-import javax.crypto.spec.PSource;
 import javax.crypto.spec.SecretKeySpec;
 
 /**
@@ -90,7 +85,7 @@ public static boolean wasTxSuccessful(RavePayInitializer ravePayInitializer, Str
         return false;
     }
 
-    private static Boolean areAmountsSame(String amount1, String amount2) {
+    private static boolean areAmountsSame(String amount1, String amount2) {
         Double number1 = Double.parseDouble(amount1);
         Double number2 = Double.parseDouble(amount2);
 
@@ -223,12 +218,12 @@ public static String decryptRef(String key, String encryptedRef) {
     }
 
     private static String encrypt(String data, String key) throws Exception {
-        byte[] keyBytes = key.getBytes(UTF_8);
+        byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
         SecretKeySpec skey = new SecretKeySpec(keyBytes, ALGORITHM);
         Cipher cipher = Cipher.getInstance(TRANSFORMATION);
 
         cipher.init(Cipher.ENCRYPT_MODE, skey);
-        byte[] plainTextBytes = data.getBytes(UTF_8);
+        byte[] plainTextBytes = data.getBytes(StandardCharsets.UTF_8);
         byte[] buf = cipher.doFinal(plainTextBytes);
         return Base64.encodeToString(buf, Base64.DEFAULT);
 
@@ -239,7 +234,7 @@ private static String getMd5(String md5) throws Exception {
         byte[] array = md.digest(md5.getBytes(CHARSET_NAME));
         StringBuffer sb = new StringBuffer();
         for (int i = 0; i < array.length; ++i) {
-            sb.append(Integer.toHexString((array[i] & 0xFF) | 0x100).substring(1, 3));
+            sb.append(Integer.toHexString((array[i] & 0xFF) | 0x100), 1, 3);
         }
         return sb.toString();
     }
@@ -300,7 +295,7 @@ public static boolean isValidLuhnNumber(String number) {
         }
 
         String reversedNumber = new StringBuffer(number).reverse().toString();
-        char reversedCharArray[] = reversedNumber.toCharArray();
+        char[] reversedCharArray = reversedNumber.toCharArray();
         int luhnSum = 0;
 
         // Double the value of every second digit from the right

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

@@ -0,0 +1,41 @@
+package com.flutterwave.raveandroid;
+
+public class ViewObject {
+
+    int viewId;
+    String data;
+    Class<?> viewType;
+
+    public ViewObject(int viewId, String data, Class<?> viewType) {
+        this.viewId = viewId;
+        this.data = data;
+        this.viewType = viewType;
+    }
+
+    public int getViewId() {
+        return viewId;
+    }
+
+    public void setViewId(int viewId) {
+        this.viewId = viewId;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+
+    public Class<?> getViewType() {
+        return viewType;
+    }
+
+    public void setViewType(Class<?> viewType) {
+        this.viewType = viewType;
+    }
+
+
+}

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

@@ -1,11 +1,15 @@
 package com.flutterwave.raveandroid.account;
 
 
+import android.app.Activity;
+
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.RavePayInitializer;
+import com.flutterwave.raveandroid.ViewObject;
 import com.flutterwave.raveandroid.data.Bank;
 import com.flutterwave.raveandroid.responses.RequeryResponse;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -42,6 +46,22 @@ interface View {
         void showFetchFeeFailed(String s);
 
         void onRequerySuccessful(RequeryResponse response, String responseAsJSONString);
+
+        void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap);
+
+        void showFieldError(int viewID, String message, Class<?> viewtype);
+
+        void showGTBankAmountIssue();
+
+        void onEmailValidated(String emailToSet, int visibility);
+
+        void onAmountValidated(String amountToSet, int visibility);
+
+        void showDateOfBirth(int whatToShow);
+
+        void showBVN(int whatToShow);
+
+        void showInternetBankingSelected(int whatToShow);
     }
 
     interface UserActionsListener {
@@ -58,6 +78,14 @@ interface UserActionsListener {
         void onDetachView();
 
         void verifyRequeryResponseStatus(RequeryResponse response, String responseAsJSONString, RavePayInitializer ravePayInitializer);
+
+        void onDataCollected(HashMap<String, ViewObject> dataHashMap);
+
+        void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayInitializer ravePayInitializer);
+
+        void init(RavePayInitializer ravePayInitializer);
+
+        void onInternetBankingValidated(Bank bank);
     }
 
 }