Merge branch 'RwandaMobileMoney' of https://github.com/mikelis135/rave-android into mikelis135-RwandaMobileMoney

biodunalfet · biodunalfet · commit b8acd89a5db4 · 2019-10-10T02:17:49.000+01:00
diff --git a/app/src/main/java/com/flutterwave/rave_android/MainActivity.java b/app/src/main/java/com/flutterwave/rave_android/MainActivity.java
@@ -45,6 +45,7 @@ public class MainActivity extends AppCompatActivity {
     SwitchCompat accountSwitch;
     SwitchCompat ghMobileMoneySwitch;
     SwitchCompat ugMobileMoneySwitch;
+    SwitchCompat rwfMobileMoneySwitch;
     SwitchCompat bankTransferSwitch;
     SwitchCompat isLiveSwitch;
     SwitchCompat isMpesaSwitch;
@@ -82,6 +83,7 @@ protected void onCreate(Bundle savedInstanceState) {
         shouldDisplayFeeSwitch = findViewById(R.id.isDisplayFeeSwitch);
         ghMobileMoneySwitch = findViewById(R.id.accountGHMobileMoneySwitch);
         ugMobileMoneySwitch = findViewById(R.id.accountUgMobileMoneySwitch);
+        rwfMobileMoneySwitch = findViewById(R.id.accountRwfMobileMoneySwitch);
         bankTransferSwitch = findViewById(R.id.bankTransferSwitch);
         isLiveSwitch = findViewById(R.id.isLiveSwitch);
         addSubAccountsSwitch = findViewById(R.id.addSubAccountsSwitch);
@@ -206,6 +208,7 @@ private void validateEntries() {
                     .acceptAchPayments(accountAchSwitch.isChecked())
                     .acceptGHMobileMoneyPayments(ghMobileMoneySwitch.isChecked())
                     .acceptUgMobileMoneyPayments(ugMobileMoneySwitch.isChecked())
+                    .acceptRwfMobileMoneyPayments(rwfMobileMoneySwitch.isChecked())
                     .acceptBankTransferPayments(bankTransferSwitch.isChecked())
                     .onStagingEnv(!isLiveSwitch.isChecked())
                     .setSubAccounts(subAccounts)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -94,6 +94,14 @@
                     android:id="@+id/accountUgMobileMoneySwitch"
                     />
 
+                <android.support.v7.widget.SwitchCompat
+                    android:id="@+id/accountRwfMobileMoneySwitch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:checked="false"
+                    android:text="Accept RWF Mobile money payments" />
+
                 <android.support.v7.widget.SwitchCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/PayloadBuilder.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/PayloadBuilder.java
@@ -37,6 +37,8 @@ public PayloadBuilder setIs_mobile_money_ug(String is_mobile_money_ug) {
         return this;
     }
 
+    private String is_mobile_money_rwf;
+
     public PayloadBuilder setIs_bank_transfer(boolean is_bank_transfer) {
         this.is_bank_transfer = is_bank_transfer;
         return this;
@@ -46,6 +48,11 @@ public PayloadBuilder setIs_bank_transfer(boolean is_bank_transfer) {
     private String is_mobile_money_gh;
     private String is_mobile_money_ug;
 
+    public PayloadBuilder setIs_mobile_money_rwf(String is_mobile_money_rwf) {
+        this.is_mobile_money_rwf = is_mobile_money_rwf;
+        return this;
+    }
+
     private String phonenumber;
 
     private String txRef;
@@ -255,6 +262,17 @@ public Payload createUgMobileMoneyPayload() {
         return payload;
     }
 
+    public Payload createRwfMobileMoneyPayload() {
+        List<Meta> metaObj = Utils.pojofyMetaString(meta);
+        List<SubAccount> subaccountsObj = Utils.pojofySubaccountString(subAccounts);
+        Payload payload = new Payload(phonenumber, metaObj, subaccountsObj, narration, ip, lastname,
+                firstname, currency, country, amount, email, device_fingerprint, txRef, pbfPubKey);
+        payload.setIs_mobile_money_gh("1");
+        payload.setPayment_type("mobilemoneygh");
+        payload.setNetwork(network);
+        return payload;
+    }
+
 
 
     public PayloadBuilder setMeta(String meta) {
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveConstants.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveConstants.java
@@ -21,6 +21,7 @@ public class RaveConstants {
     public static String NG = "NG";
     public static String NGN = "NGN";
     public static String UGX = "UGX";
+    public static String RWF = "RWF";
     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
@@ -25,6 +25,7 @@
 import com.flutterwave.raveandroid.di.modules.NetworkModule;
 import com.flutterwave.raveandroid.ghmobilemoney.GhMobileMoneyFragment;
 import com.flutterwave.raveandroid.mpesa.MpesaFragment;
+import com.flutterwave.raveandroid.rwfmobilemoney.RwfMobileMoneyFragment;
 import com.flutterwave.raveandroid.ugmobilemoney.UgMobileMoneyFragment;
 
 import org.parceler.Parcels;
@@ -121,6 +122,10 @@ else if (ravePayInitializer.getCountry().equalsIgnoreCase("ng") && ravePayInitia
             raveFragments.add(new RaveFragment(new UgMobileMoneyFragment(), "UGANDA MOBILE MONEY"));
         }
 
+        if (ravePayInitializer.isWithRwfMobileMoney()) {
+            raveFragments.add(new RaveFragment(new RwfMobileMoneyFragment(), "RWANDA MOBILE MONEY"));
+        }
+
         if (ravePayInitializer.isWithBankTransfer()) {
             if (ravePayInitializer.getCountry().equalsIgnoreCase("ng") && ravePayInitializer.getCurrency().equalsIgnoreCase("ngn")){
                 raveFragments.add(new RaveFragment(new BankTransferFragment(), "Bank Transfer"));
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java
@@ -27,6 +27,7 @@ public class RavePayInitializer {
     boolean withAccount = true;
     boolean withGHMobileMoney = false;
     boolean withUgMobileMoney = false;
+    boolean withRwfMobileMoney = false;
     boolean withBankTransfer = false;
     int theme;
     boolean staging = true;
@@ -39,7 +40,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
                               String currency, String country, String fName,
                               String lName, boolean withCard,
                               boolean withAccount, boolean withMpesa, boolean withGHMobileMoney,
-                              boolean withUgMobileMoney,
+                              boolean withUgMobileMoney, boolean withRwfMobileMoney,
                               boolean withAch, boolean withBankTransfer, int theme,
                               boolean staging, String meta, String subAccounts, String payment_plan, boolean isPreAuth,
                               boolean showStagingLabel, boolean displayFee) {
@@ -56,6 +57,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
         this.withAccount = withAccount;
         this.withGHMobileMoney = withGHMobileMoney;
         this.withUgMobileMoney = withUgMobileMoney;
+        this.withRwfMobileMoney = withRwfMobileMoney;
         this.withBankTransfer = withBankTransfer;
         this.withMpesa = withMpesa;
         this.withCard = withCard;
@@ -133,6 +135,10 @@ public boolean isWithUgMobileMoney() {
         return withUgMobileMoney;
     }
 
+    public boolean isWithRwfMobileMoney() {
+        return withRwfMobileMoney;
+    }
+
 
     public boolean isWithBankTransfer() {
         return withBankTransfer;
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java
@@ -35,6 +35,7 @@ public class RavePayManager {
     boolean withMpesa = false;
     boolean withGHMobileMoney = false;
     boolean withUgMobileMoney = false;
+    boolean withRwfMobileMoney = false;
     boolean withBankTransfer = false;
     private int theme = R.style.DefaultTheme;
     boolean staging = true;
@@ -92,6 +93,11 @@ public RavePayManager acceptUgMobileMoneyPayments(boolean withUgMobileMoney) {
         return this;
     }
 
+    public RavePayManager acceptRwfMobileMoneyPayments(boolean withRwfMobileMoney) {
+        this.withRwfMobileMoney = withRwfMobileMoney;
+        return this;
+    }
+
     public RavePayManager acceptBankTransferPayments(boolean withBankTransfer) {
         this.withBankTransfer = withBankTransfer;
         return this;
@@ -195,7 +201,7 @@ public RavePayManager shouldDisplayFee(boolean displayFee) {
     public RavePayInitializer createRavePayInitializer() {
         return new RavePayInitializer(email, amount, publicKey, encryptionKey, txRef, narration,
                 currency, country, fName, lName, withCard, withAccount, withMpesa,
-                withGHMobileMoney, withUgMobileMoney, withAch, withBankTransfer, theme, staging, meta, subAccounts,
+                withGHMobileMoney, withUgMobileMoney, withRwfMobileMoney, withAch, withBankTransfer, theme, staging, meta, subAccounts,
                 payment_plan,
                 isPreAuth, showStagingLabel,displayFee);
        }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/AppComponent.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/AppComponent.java
@@ -10,6 +10,7 @@
 import com.flutterwave.raveandroid.di.modules.GhanaModule;
 import com.flutterwave.raveandroid.di.modules.MpesaModule;
 import com.flutterwave.raveandroid.di.modules.NetworkModule;
+import com.flutterwave.raveandroid.di.modules.RwandaModule;
 import com.flutterwave.raveandroid.di.modules.UgandaModule;
 
 import javax.inject.Singleton;
@@ -28,6 +29,8 @@ public interface AppComponent {
 
     UgandaComponent plus(UgandaModule ugandaModule);
 
+    RwandaComponent plus(RwandaModule rwandaModule);
+
     GhanaComponent plus(GhanaModule ghanaModule);
 
     CardComponent plus(CardModule cardModule);
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/RwandaComponent.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/RwandaComponent.java
@@ -0,0 +1,14 @@
+package com.flutterwave.raveandroid.di.components;
+
+
+import com.flutterwave.raveandroid.di.modules.RwandaModule;
+import com.flutterwave.raveandroid.di.scopes.RwandaScope;
+import com.flutterwave.raveandroid.rwfmobilemoney.RwfMobileMoneyFragment;
+
+import dagger.Subcomponent;
+
+@RwandaScope
+@Subcomponent(modules = {RwandaModule.class})
+public interface RwandaComponent {
+    void inject(RwfMobileMoneyFragment rwfMobileMoneyFragment);
+}
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/RwandaModule.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/RwandaModule.java
@@ -0,0 +1,24 @@
+package com.flutterwave.raveandroid.di.modules;
+
+import com.flutterwave.raveandroid.rwfmobilemoney.RwfMobileMoneyContract;
+
+import javax.inject.Inject;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class RwandaModule {
+
+    private RwfMobileMoneyContract.View view;
+
+    @Inject
+    public RwandaModule(RwfMobileMoneyContract.View view) {
+        this.view = view;
+    }
+
+    @Provides
+    public RwfMobileMoneyContract.View providesContract() {
+        return view;
+    }
+}
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/RwandaScope.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/RwandaScope.java
@@ -0,0 +1,11 @@
+package com.flutterwave.raveandroid.di.scopes;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Scope;
+
+@Scope
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RwandaScope {
+}
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java
@@ -0,0 +1,69 @@
+package com.flutterwave.raveandroid.rwfmobilemoney;
+
+import com.flutterwave.raveandroid.Payload;
+import com.flutterwave.raveandroid.ViewObject;
+
+import java.util.HashMap;
+
+public class NullRwfMobileMoneyView implements RwfMobileMoneyContract.View {
+
+    @Override
+    public void showToast(String message) {
+
+    }
+
+    @Override
+    public void showFetchFeeFailed(String s) {
+
+    }
+
+    @Override
+    public void onPaymentError(String message) {
+
+    }
+
+    @Override
+    public void showPollingIndicator(boolean active) {
+
+    }
+
+    @Override
+    public void showProgressIndicator(boolean active) {
+
+    }
+
+    @Override
+    public void onAmountValidationSuccessful(String amountToPay) {
+
+    }
+
+    @Override
+    public void displayFee(String charge_amount, Payload payload) {
+
+    }
+
+    @Override
+    public void showFieldError(int viewID, String message, Class<?> viewType) {
+
+    }
+
+    @Override
+    public void onPaymentFailed(String message, String responseAsJSONString) {
+
+    }
+
+    @Override
+    public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
+
+    }
+
+    @Override
+    public void onPollingRoundComplete(String flwRef, String txRef, String publicKey) {
+
+    }
+
+    @Override
+    public void onPaymentSuccessful(String status, String flwRef, String responseAsString) {
+
+    }
+}
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyContract.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyContract.java
@@ -0,0 +1,58 @@
+package com.flutterwave.raveandroid.rwfmobilemoney;
+
+import com.flutterwave.raveandroid.Payload;
+import com.flutterwave.raveandroid.RavePayInitializer;
+import com.flutterwave.raveandroid.ViewObject;
+
+import java.util.HashMap;
+
+/**
+ * Created by Jeremiah on 28/06/2018.
+ */
+
+public interface RwfMobileMoneyContract {
+
+    interface View {
+        void showToast(String message);
+
+        void showFetchFeeFailed(String s);
+
+        void onPaymentError(String message);
+
+        void showPollingIndicator(boolean active);
+
+        void showProgressIndicator(boolean active);
+
+        void onAmountValidationSuccessful(String amountToPay);
+
+        void displayFee(String charge_amount, Payload payload);
+
+        void showFieldError(int viewID, String message, Class<?> viewType);
+
+        void onPaymentFailed(String message, String responseAsJSONString);
+
+        void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap);
+
+        void onPollingRoundComplete(String flwRef, String txRef, String publicKey);
+
+        void onPaymentSuccessful(String status, String flwRef, String responseAsString);
+    }
+
+    interface UserActionsListener {
+        void fetchFee(Payload payload);
+
+        void init(RavePayInitializer ravePayInitializer);
+
+        void onDataCollected(HashMap<String, ViewObject> dataHashMap);
+
+        void requeryTx(String flwRef, String txRef, String publicKey);
+
+        void chargeRwfMobileMoney(Payload payload, String encryptionKey);
+
+        void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayInitializer ravePayInitializer);
+
+        void onAttachView(View view);
+
+        void onDetachView();
+    }
+}
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java
diff --git a/raveandroid/src/main/res/layout/fragment_rwf_mobile_money.xml b/raveandroid/src/main/res/layout/fragment_rwf_mobile_money.xml
diff --git a/raveandroid/src/main/res/values/strings.xml b/raveandroid/src/main/res/values/strings.xml
