Merge pull request #4 from Flutterwave/master

jeremiahAI · web-flow · commit c8a489b5b5d2 · 2019-04-10T15:00:56.000+01:00
Update
diff --git a/README.md b/README.md
@@ -70,6 +70,7 @@ Set the public key, encryption key and other required parameters. The `RavePayMa
                         .isPreAuth(boolean)
                         .setSubAccounts(List<SubAccount>)
                         .shouldDisplayFee(boolean)
+                        .showStagingLabel(boolean)
                         .initialize();
 
 | function        | parameter           | type | required  |
@@ -97,6 +98,7 @@ Set the public key, encryption key and other required parameters. The `RavePayMa
 | withTheme(styleId) | Sets the theme of the UI. | `int` | Not Required
 | setPaymentPlan(payment_plan) | If you want to do recurrent payment, this is the payment plan ID to use for the recurring payment, you can see how to create payment plans [here](https://flutterwavedevelopers.readme.io/v2.0/reference#create-payment-plan) and [here](https://flutterwavedevelopers.readme.io/docs/recurring-billing). This is only available for card payments | `String` | Not Required
 | shouldDisplayFee(boolean) | Set to `false` to not display a dialog for confirming total amount(including charge fee) that Rave will charge. By default this is set to `true` | `boolean` | Not Required
+| showStagingLabel(boolean) | Set to `false` to not display a staging label when in staging environment. By default this is set to `true` | `boolean` | Not Required
 | initialize() | Launch the Rave Payment UI  |  N/A | Required
 
 ###  2. Handle the response
@@ -124,7 +126,7 @@ In the calling activity, override the `onActivityResult` method to receive the p
             super.onActivityResult(requestCode, resultCode, data);
         }
     }
-The intent's `message` object contains the raw JSON response from the Rave API. This can be parsed to retrieve any additional payment information needed.
+The intent's `message` object contains the raw JSON response from the Rave API. This can be parsed to retrieve any additional payment information needed. Typical success response can be found [here](https://gist.github.com/BolajisBrain/305ef5a6df7744694d9c35787580a2d2) and failed response [here](https://gist.github.com/BolajisBrain/afa972cbca782bbb942984ddec9f5262).
 
 > **PLEASE NOTE**
 >  We advise you to do a further verification of transaction's details on your server to be
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,8 +23,8 @@ dependencies {
     androidTestImplementation ('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
     implementation project(':raveandroid')
 }
diff --git a/app/src/main/java/com/flutterwave/rave_android/MainActivity.java b/app/src/main/java/com/flutterwave/rave_android/MainActivity.java
@@ -50,6 +50,7 @@ public class MainActivity extends AppCompatActivity {
     SwitchCompat accountAchSwitch;
     SwitchCompat addSubAccountsSwitch;
     SwitchCompat isPreAuthSwitch;
+    SwitchCompat shouldShowStagingLabelSwitch;
     List<Meta> meta = new ArrayList<>();
     List<SubAccount> subAccounts = new ArrayList<>();
     LinearLayout addSubaccountsLayout;
@@ -80,6 +81,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ugMobileMoneySwitch = findViewById(R.id.accountUgMobileMoneySwitch);
         isLiveSwitch = findViewById(R.id.isLiveSwitch);
         addSubAccountsSwitch = findViewById(R.id.addSubAccountsSwitch);
+        shouldShowStagingLabelSwitch = findViewById(R.id.shouldShowStagingLabelSwitch);
         addVendorBtn = findViewById(R.id.addVendorBtn);
         clearVendorBtn = findViewById(R.id.clearVendorsBtn);
         vendorListTXT = findViewById(R.id.refIdsTV);
@@ -202,6 +204,7 @@ private void validateEntries() {
                     .onStagingEnv(!isLiveSwitch.isChecked())
                     .setSubAccounts(subAccounts)
                     .isPreAuth(isPreAuthSwitch.isChecked())
+                    .showStagingLabel(shouldShowStagingLabelSwitch.isChecked())
 //                    .setMeta(meta)
 //                    .withTheme(R.style.TestNewTheme)
                     .initialize();
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -57,6 +57,16 @@
                     android:id="@+id/isDisplayFeeSwitch"
                     />
 
+                <android.support.v7.widget.SwitchCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:text="Show Staging Label"
+                    android:checked="true"
+                    android:id="@+id/shouldShowStagingLabelSwitch"
+                    />
+
+
                 <android.support.v7.widget.SwitchCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/build.gradle b/build.gradle
@@ -2,11 +2,11 @@
 
 buildscript {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         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
@@ -15,8 +15,8 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 11 09:31:48 WAT 2018
+#Wed Jan 23 18:21:35 WAT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/raveandroid/build.gradle b/raveandroid/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.flutterwave'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
 
@@ -27,9 +27,9 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    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.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveConstants.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveConstants.java
@@ -16,6 +16,7 @@ public class RaveConstants {
     public static String LIVE_URL = "https://raveapi.azurewebsites.net";
     public static String VBV = "VBVSECURECODE";
     public static String GTB_OTP = "GTB_OTP";
+    public static String ACCESS_OTP = "ACCESS_OTP";
     public static String NOAUTH = "NOAUTH";
     public static String PIN = "PIN";
     public static String AVS_VBVSECURECODE = "AVS_VBVSECURECODE";
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java
@@ -79,6 +79,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if (ravePayInitializer.isStaging()) {
             BASE_URL = RaveConstants.STAGING_URL;
+            if(ravePayInitializer.getShowStagingLabel()){
+                findViewById(R.id.stagingModeBannerLay).setVisibility(View.VISIBLE);
+            }
         }
         else {
             BASE_URL = RaveConstants.LIVE_URL;
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java
@@ -33,6 +33,7 @@ public class RavePayInitializer {
     boolean staging = true;
     boolean isPreAuth = false;
     boolean displayFee = true;
+    boolean showStagingLabel;
 
     public RavePayInitializer(String email, double amount, String publicKey,
                               String encryptionKey, String txRef, String narration,
@@ -41,7 +42,8 @@ public RavePayInitializer(String email, double amount, String publicKey,
                               boolean withAccount, boolean withMpesa, boolean withGHMobileMoney,
                               boolean withUgMobileMoney,
                               boolean withAch, int theme,
-                              boolean staging, String meta, String subAccounts, String payment_plan, boolean isPreAuth) {
+                              boolean staging, String meta, String subAccounts, String payment_plan, boolean isPreAuth,
+                              boolean showStagingLabel) {
         this.email = email;
         this.amount = amount;
         this.publicKey = publicKey;
@@ -64,11 +66,20 @@ public RavePayInitializer(String email, double amount, String publicKey,
         this.subAccounts = subAccounts;
         this.payment_plan = payment_plan;
         this.isPreAuth = isPreAuth;
+        this.showStagingLabel = showStagingLabel;
     }
 
     public RavePayInitializer() {
     }
 
+    public boolean getShowStagingLabel() {
+        return showStagingLabel;
+    }
+
+    public void showStagingLabel(boolean showStagingLabel) {
+        this.showStagingLabel = showStagingLabel;
+    }
+
     public boolean isWithMpesa() {
         return withMpesa;
     }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java
@@ -39,6 +39,7 @@ public class RavePayManager {
     boolean staging = true;
     boolean allowSaveCard = true;
     boolean isPreAuth =  false;
+    boolean showStagingLabel = true;
 
     public RavePayManager allowSaveCardFeature(boolean allowSaveCard) {
         this.allowSaveCard = allowSaveCard;
@@ -104,6 +105,11 @@ public RavePayManager setSubAccounts(List<SubAccount> subAccounts){
         return this;
     }
 
+    public RavePayManager showStagingLabel(Boolean showStagingLabel){
+        this.showStagingLabel = showStagingLabel;
+        return this;
+    }
+
 
     public RavePayManager setEmail(String email) {
         this.email = email;
@@ -179,6 +185,6 @@ public RavePayInitializer createRavePayInitializer() {
                 currency, country, fName, lName, withCard, withAccount, withMpesa,
                 withGHMobileMoney, withUgMobileMoney, withAch, theme, staging, meta, subAccounts,
                 payment_plan,
-                isPreAuth);
+                isPreAuth, showStagingLabel);
        }
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardPresenter.java
@@ -89,7 +89,9 @@ else if (suggested_auth.equalsIgnoreCase(RaveConstants.NOAUTH_INTERNATIONAL)) {
 
                                 mView.onVBVAuthModelUsed(authUrlCrude, flwRef);
                             }
-                            else if (authModelUsed.equalsIgnoreCase(RaveConstants.GTB_OTP)) {
+                            else if (authModelUsed.equalsIgnoreCase(RaveConstants.GTB_OTP)
+                                    ||  authModelUsed.equalsIgnoreCase(RaveConstants.ACCESS_OTP)
+                                    || authModelUsed.toLowerCase().contains("otp")) {
                                 String flwRef = response.getData().getFlwRef();
                                 String chargeResponseMessage = response.getData().getChargeResponseMessage();
                                 chargeResponseMessage = chargeResponseMessage == null ? "Enter your one  time password (OTP)" : chargeResponseMessage;
diff --git a/raveandroid/src/main/res/layout/activity_rave_pay.xml b/raveandroid/src/main/res/layout/activity_rave_pay.xml
@@ -1,50 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:tools="http://schemas.android.com/tools"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-tools:context="com.flutterwave.raveandroid.RavePayActivity">
-
-<include
-    android:id="@+id/main_content"
-    layout="@layout/content_rave_pay" />
-
-<RelativeLayout
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:gravity="center"
-    android:clickable="true"
-    android:background="#fff"
-    android:id="@+id/rave_permission_required_layout"
-    android:visibility="gone"
-    android:padding="30dp"
-    android:layout_height="match_parent">
-
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/textView"
-        android:layout_centerHorizontal="true"
-        android:textSize="14sp"
-        android:gravity="center_horizontal"
-        android:layout_marginBottom="7dp"
-        android:text="@string/permissions_are_required_to_complete_payment"
-        />
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/Base.Widget.AppCompat.Button.Borderless"
-        android:textSize="12sp"
-        android:layout_below="@id/textView"
-        android:textColor="#009688"
-        android:textStyle="bold"
-        android:layout_centerHorizontal="true"
-        android:id="@+id/requestPermsBtn"
-        android:text="@string/grant_permission"
-        />
-
-</RelativeLayout>
+    android:layout_height="match_parent"
+    tools:context="com.flutterwave.raveandroid.RavePayActivity">
+
+    <include
+        android:id="@+id/main_content"
+        layout="@layout/content_rave_pay" />
+
+    <RelativeLayout
+        android:id="@+id/rave_permission_required_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#fff"
+        android:clickable="true"
+        android:gravity="center"
+        android:padding="30dp"
+        android:visibility="gone">
+
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="7dp"
+            android:gravity="center_horizontal"
+            android:text="@string/permissions_are_required_to_complete_payment"
+            android:textSize="14sp" />
+
+        <Button
+            android:id="@+id/requestPermsBtn"
+            style="@style/Base.Widget.AppCompat.Button.Borderless"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/textView"
+            android:layout_centerHorizontal="true"
+            android:text="@string/grant_permission"
+            android:textColor="#009688"
+            android:textSize="12sp"
+            android:textStyle="bold" />
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/stagingModeBannerLay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:gravity="bottom">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:background="@android:color/holo_red_dark"
+            android:gravity="center"
+            android:text="You are currently on staging mode"
+            android:textColor="@android:color/white" />
+
+    </RelativeLayout>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/raveandroid/src/main/res/values/strings.xml b/raveandroid/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="permissions_are_required_to_complete_payment">Rave Pay requires READ PHONE STATE permissions to work</string>
+    <string name="permissions_are_required_to_complete_payment">Rave Pay needs phone access in order to uniquely identify the devices associated with your account and ensure that unauthorized devices are not able to act on your behalf. Ravepay will never use or store your phone number or call history. </string>
     <string name="grant_permission">Grant permission</string>
     <string name="permission_required_image">permission_required_image</string>
     <string name="title_activity_entry">EntryActivity</string>

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,9 @@ protected void onCreate(Bundle savedInstanceState) {`
`79`	`79`
`80`	`80`	`if (ravePayInitializer.isStaging()) {`
`81`	`81`	`BASE_URL = RaveConstants.STAGING_URL;`
	`82`	`+ if(ravePayInitializer.getShowStagingLabel()){`
	`83`	`+ findViewById(R.id.stagingModeBannerLay).setVisibility(View.VISIBLE);`
	`84`	`+ }`
`82`	`85`	`}`
`83`	`86`	`else {`
`84`	`87`	`BASE_URL = RaveConstants.LIVE_URL;`