Merge pull request #1 from Flutterwave/master

Update with master

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.32'
+	     implementation 'com.github.Flutterwave:rave-android:1.0.33'
 	}
 
 **Step 3.** Add the required permission
@@ -69,6 +69,7 @@ Set the public key, encryption key and other required parameters. The `RavePayMa
                         .withTheme(styleId)
                         .isPreAuth(boolean)
                         .setSubAccounts(List<SubAccount>)
+                        .shouldDisplayFee(boolean)
                         .initialize();
 
 | function        | parameter           | type | required  |
@@ -80,8 +81,8 @@ Set the public key, encryption key and other required parameters. The `RavePayMa
 | setlName(lName) | This is the last name of the card holder or the customer | `String` | Required
 | setEmail(email) | This is the email address of the customer | `String` | Required
 | setNarration(narration) | This is a custom description added by the merchant | `String` | Not Required
-| setPublicKey(publicKey) | Merchant's public key. | `String` | Required
-| setEncryptionKey(encryptionKey) | Merchant's encryption key | `String` | Required
+| 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
 | acceptAccountPayments(boolean) | Set to `true` if you want to accept payments via cards, else set to `false`. | `boolean` | Not Required
 | acceptCardPayments(boolean) | Set to `true` if you want to accept payments via bank accounts, else set to `false` | `boolean` | Not Required |
@@ -95,6 +96,7 @@ Set the public key, encryption key and other required parameters. The `RavePayMa
 | setIsPreAuth(boolean) | Set to `true` to preauthorise the transaction amount. [Learn more about preauthourization](https://developer.flutterwave.com/v2.0/reference#introduction-1). | `int` | Not Required
 | 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
 | initialize() | Launch the Rave Payment UI  |  N/A | Required
 
 ###  2. Handle the response

app/src/main/res/layout/activity_main.xml

@@ -48,6 +48,15 @@
                     android:id="@+id/accountMpesaSwitch"
                     />
 
+                <android.support.v7.widget.SwitchCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:text="Should Display Fee"
+                    android:checked="true"
+                    android:id="@+id/isDisplayFeeSwitch"
+                    />
+
                 <android.support.v7.widget.SwitchCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

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

@@ -32,6 +32,7 @@ public class RavePayInitializer {
     int theme;
     boolean staging = true;
     boolean isPreAuth = false;
+    boolean displayFee = true;
 
     public RavePayInitializer(String email, double amount, String publicKey,
                               String encryptionKey, String txRef, String narration,
@@ -53,7 +54,6 @@ 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;
@@ -229,4 +229,11 @@ public void setPayment_plan(String payment_plan) {
     public void setPreAuth( Boolean isPreAuth){ this.isPreAuth = isPreAuth; }
 
     public boolean getIsPreAuth() { return  isPreAuth; }
+
+    public boolean getIsDisplayFee() {
+        return displayFee;
+    }
+    public void setIsDisplayFee() {
+        this.displayFee = displayFee;
+    }
 }

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

@@ -269,7 +269,11 @@ private void validateDetails() {
                 showGTBankAmountIssue();
             }
             else {
-                presenter.fetchFee(body, selectedBank.isInternetbanking());
+                if(ravePayInitializer.getIsDisplayFee()){
+                    presenter.fetchFee(body, selectedBank.isInternetbanking());
+                } else {
+                    presenter.chargeAccount(body, ravePayInitializer.getEncryptionKey(), selectedBank.isInternetbanking());
+                }
             }
 
         }

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchContract.java

@@ -33,7 +33,7 @@ interface UserActionsListener {
 
         void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amount);
 
-        void chargeAccount(Payload payload, String encryptionKey);
+        void chargeAccount(Payload payload, String encryptionKey, boolean isDisplayFee);
 
         void verifyRequeryResponse(RequeryResponse response, String responseAsJSONString, RavePayInitializer ravePayInitializer, String flwRef);
 

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchPresenter.java

@@ -4,7 +4,6 @@
 
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.PayloadBuilder;
-import com.flutterwave.raveandroid.RaveConstants;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.Utils;
 import com.flutterwave.raveandroid.card.ChargeRequestBody;
@@ -15,8 +14,6 @@
 import com.flutterwave.raveandroid.responses.ChargeResponse;
 import com.flutterwave.raveandroid.responses.RequeryResponse;
 
-import static com.flutterwave.raveandroid.RaveConstants.AVS_VBVSECURECODE;
-
 
 public class AchPresenter implements AchContract.UserActionsListener {
 
@@ -112,11 +109,11 @@ private void initiatePayment(RavePayInitializer ravePayInitializer) {
 
         Payload body = builder.createBankPayload();
 
-        chargeAccount(body, ravePayInitializer.getEncryptionKey());
+        chargeAccount(body, ravePayInitializer.getEncryptionKey(), ravePayInitializer.getIsDisplayFee());
     }
 
     @Override
-    public void chargeAccount(Payload payload, String encryptionKey) {
+    public void chargeAccount(Payload payload, String encryptionKey, final boolean isDisplayFee) {
 
         String requestBodyAsString = Utils.convertChargeRequestPayloadToJson(payload);
         String accountRequestBody = Utils.getEncryptedData(requestBodyAsString, encryptionKey);
@@ -143,8 +140,12 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
                         String currency = response.getData().getCurrency();
                         sharedMgr.saveFlwRef(flwRef);
 
-                        mView.showFee(authUrl, flwRef, chargedAmount, currency);
-//                        mView.showWebView(authUrl, flwRef);
+                        if (isDisplayFee) {
+                            mView.showFee(authUrl, flwRef, chargedAmount, currency);
+                        }
+                        else {
+                            mView.showWebView(authUrl, flwRef);
+                        }
                     }
                     else {
                         mView.onPaymentError("No authUrl was returned");

raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java

@@ -309,7 +309,11 @@ private void validateDetails() {
 
             Payload body = builder.createPayload();
 
-            presenter.fetchFee(body, RaveConstants.MANUAL_CARD_CHARGE);
+            if(ravePayInitializer.getIsDisplayFee()){
+                presenter.fetchFee(body, RaveConstants.MANUAL_CARD_CHARGE);
+            } else {
+                presenter.chargeCard(body, ravePayInitializer.getEncryptionKey());
+            }
 
         }
     }

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

@@ -225,7 +225,11 @@ private void validate() {
 
             Payload body = builder.createGhMobileMoneyPayload();
 
-            presenter.fetchFee(body);
+            if(ravePayInitializer.getIsDisplayFee()){
+                presenter.fetchFee(body);
+            } else {
+                presenter.chargeGhMobileMoney(body, ravePayInitializer.getEncryptionKey());
+            }
         }
 
     }

raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java

@@ -180,7 +180,11 @@ private void validate() {
 
             Payload body = builder.createMpesaPayload();
 
-            presenter.fetchFee(body);
+            if(ravePayInitializer.getIsDisplayFee()){
+                presenter.fetchFee(body);
+            } else {
+                presenter.chargeMpesa(body, ravePayInitializer.getEncryptionKey());
+            }
         }
 
     }

raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java

@@ -164,7 +164,11 @@ private void validate() {
 
             Payload body = builder.createUgMobileMoneyPayload();
 
-            presenter.fetchFee(body);
+            if(ravePayInitializer.getIsDisplayFee()){
+                presenter.fetchFee(body);
+            } else {
+                presenter.chargeUgMobileMoney(body, ravePayInitializer.getEncryptionKey());
+            }
         }
 
     }