Merge pull request #2 from Flutterwave/master

Update

Author: jeremiahAI

README.md

@@ -28,7 +28,7 @@ The minimum supported SDK version is 15
 **Step 2.** Add the dependency
 
     dependencies {
-	     implementation 'com.github.Flutterwave:rave-android:1.0.33'
+	     implementation 'com.github.Flutterwave:rave-android:1.0.35'
 	}
 
 **Step 3.** Add the required permission

build.gradle

@@ -6,8 +6,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

raveandroid/build.gradle

@@ -4,7 +4,6 @@ group = 'com.github.flutterwave'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '28.0.2'
 
     defaultConfig {
         minSdkVersion 15
@@ -31,10 +30,10 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:25.4.0'
     implementation 'com.android.support:design:25.4.0'
     implementation 'com.android.support:support-v4:25.4.0'
-    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.8.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1'
     implementation 'org.parceler:parceler-api:1.1.9'
     annotationProcessor 'org.parceler:parceler:1.1.9'
     implementation 'com.squareup.retrofit2:converter-scalars:2.1.0'

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

@@ -312,7 +312,7 @@ public void setPin(String pin) {
 
     private String pin;
 
-    private String redirect_url = "https://rave-webhook.herokuapp.com/receivepayment";
+    private String redirect_url = RaveConstants.RAVE_3DS_CALLBACK;
 
     public String getPBFSecKey() {
         return PBFSecKey;

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

@@ -22,6 +22,7 @@ public class RaveConstants {
     public static String NOAUTH_INTERNATIONAL = "NOAUTH_INTERNATIONAL";
     public static String RAVEPAY = "ravepay";
     public static String RAVE_PARAMS = "raveparams";
+    public static String RAVE_3DS_CALLBACK = "https://rave-webhook.herokuapp.com/receivepayment";
     public static int RAVE_REQUEST_CODE = 4199;
     public static int MANUAL_CARD_CHARGE = 403;
     public static int TOKEN_CHARGE = 24;

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

@@ -54,6 +54,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
         this.lName = lName;
         this.withAccount = withAccount;
         this.withGHMobileMoney = withGHMobileMoney;
+        this.withUgMobileMoney = withUgMobileMoney;
         this.withMpesa = withMpesa;
         this.withCard = withCard;
         this.withAch = withAch;

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

@@ -85,7 +85,7 @@ public void onPageFinished(WebView view, String url) {
             showProgressIndicator(false);
 
             Log.d("finished URLS", url);
-            if (url.contains("/complete") || url.contains("submitting_mock_form")) {
+            if (url.contains(RaveConstants.RAVE_3DS_CALLBACK)) {
                 goBack();
             }
         }

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

@@ -230,15 +230,17 @@ private void validateDetails() {
                     dob = dob.replace("/", "");
                 }
             }
-        }
 
-        if(selectedBank.getBankcode().equals("033")){
-            if(bvn.length() != 11){
-                rave_bvnTil.setError("Enter a valid BVN");
-                valid = false;
+            if(selectedBank.getBankcode().equals("033")){
+                if(bvn.length() != 11){
+                    rave_bvnTil.setError("Enter a valid BVN");
+                    valid = false;
+                }
             }
         }
 
+
+
         if (valid) {
             String txRef = ravePayInitializer.getTxRef();