make optional mutability of emails and phone numbers for saving cards

Author: bolaware

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

@@ -301,7 +301,7 @@ private void validateEntries() {
                         .acceptMpesaPayments(isMpesaSwitch.isChecked())
                         .acceptAccountPayments(accountSwitch.isChecked())
                         .acceptCardPayments(cardSwitch.isChecked())
-                        .allowSaveCardFeature(allowSavedCardsSwitch.isChecked())
+                        .allowSaveCardFeature(allowSavedCardsSwitch.isChecked(), true)
                         .acceptAchPayments(accountAchSwitch.isChecked())
                         .acceptGHMobileMoneyPayments(ghMobileMoneySwitch.isChecked())
                         .acceptUgMobileMoneyPayments(ugMobileMoneySwitch.isChecked())
@@ -320,7 +320,7 @@ private void validateEntries() {
                         .setEmail(email)
                         .setfName(fName)
                         .setlName(lName)
-                        .setPhoneNumber(phoneNumber)
+                        .setPhoneNumber(phoneNumber, false)
                         .setNarration(narration)
                         .setPublicKey(publicKey)
                         .setEncryptionKey(encryptionKey)

rave_android/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java

@@ -37,6 +37,7 @@
 import com.flutterwave.raveandroid.francMobileMoney.FrancMobileMoneyFragment;
 import com.flutterwave.raveandroid.ghmobilemoney.GhMobileMoneyFragment;
 import com.flutterwave.raveandroid.mpesa.MpesaFragment;
+import com.flutterwave.raveandroid.rave_cache.SharedPrefsRepo;
 import com.flutterwave.raveandroid.rave_core.di.DeviceIdGetterModule;
 import com.flutterwave.raveandroid.rave_java_commons.RaveConstants;
 import com.flutterwave.raveandroid.rave_logger.Event;
@@ -107,6 +108,9 @@ public class RavePayActivity extends AppCompatActivity {
     @Inject
     EventLogger eventLogger;
 
+    @Inject
+    SharedPrefsRepo sharedManager;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -16,6 +16,7 @@ public class RavePayInitializer {
     private boolean isPhoneEditable = true;
     String phoneNumber = "";
     private boolean saveCardFeatureAllowed = true;
+    private boolean usePhoneAndEmailSuppliedToSaveCards = true;
     String email;
     double amount;
     String publicKey;
@@ -41,7 +42,8 @@ public class RavePayInitializer {
     public RavePayInitializer(String email, double amount, String publicKey,
                               String encryptionKey, String txRef, String narration,
                               String currency, String country, String fName,
-                              String lName, int theme, String phoneNumber, boolean isPhoneEditable, boolean saveCardFeatureAllowed,
+                              String lName, int theme, String phoneNumber,
+                              boolean isPhoneEditable, boolean saveCardFeatureAllowed, boolean usePhoneAndEmailSuppliedToSaveCards,
                               boolean isPermanent, int duration, int frequency,
                               boolean staging, String meta, String subAccounts, String payment_plan, boolean isPreAuth,
                               boolean showStagingLabel, boolean displayFee, ArrayList<Integer> orderedPaymentTypesList) {
@@ -67,6 +69,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
         this.phoneNumber = phoneNumber;
         this.isPhoneEditable = isPhoneEditable;
         this.saveCardFeatureAllowed = saveCardFeatureAllowed;
+        this.usePhoneAndEmailSuppliedToSaveCards = usePhoneAndEmailSuppliedToSaveCards;
         this.showStagingLabel = showStagingLabel;
         this.displayFee = displayFee;
         if (!orderedPaymentTypesList.isEmpty())
@@ -260,4 +263,8 @@ public void setDuration(int duration) {
     public boolean isSaveCardFeatureAllowed() {
         return saveCardFeatureAllowed;
     }
+
+    public boolean isUsePhoneAndEmailSuppliedToSaveCards() {
+        return usePhoneAndEmailSuppliedToSaveCards;
+    }
 }

rave_android/src/main/java/com/flutterwave/raveandroid/RaveUiManager.java

@@ -42,6 +42,7 @@ public class RaveUiManager extends RavePayManager {
     private android.app.Fragment fragment;
     private int theme = R.style.DefaultTheme;
     private boolean allowSaveCard = true;
+    private boolean usePhoneAndEmailSuppliedToSaveCards = true;
     protected boolean showStagingLabel = true;
     private Boolean allowEditPhone = true;
 
@@ -189,6 +190,12 @@ public RaveUiManager allowSaveCardFeature(boolean allowSaveCard) {
         return this;
     }
 
+    public RaveUiManager allowSaveCardFeature(boolean allowSaveCard, boolean usePhoneAndEmailSuppliedToSaveCards) {
+        this.allowSaveCard = allowSaveCard;
+        this.usePhoneAndEmailSuppliedToSaveCards = usePhoneAndEmailSuppliedToSaveCards;
+        return this;
+    }
+
     public RaveUiManager acceptAchPayments(boolean withAch) {
         if (!orderedPaymentTypesList.contains(PAYMENT_TYPE_ACH) && withAch)
             orderedPaymentTypesList.add(PAYMENT_TYPE_ACH);
@@ -347,6 +354,7 @@ private RavePayInitializer createRavePayInitializer() {
                 getPhoneNumber(),
                 allowEditPhone,
                 allowSaveCard,
+                usePhoneAndEmailSuppliedToSaveCards,
                 isPermanent(),
                 getDuration(),
                 getFrequency(),

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

@@ -187,7 +187,7 @@ private void setListeners() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
                 if (b) {
-                    saveNewCardLayout.setVisibility(VISIBLE);
+                    presenter.onSavedCardSwitchSwitchedOn(ravePayInitializer);
                     shouldISaveThisCard = true;
                 } else {
                     saveNewCardLayout.setVisibility(View.GONE);
@@ -197,6 +197,15 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
         });
     }
 
+    @Override
+    public void setSavedCardsLayoutVisibility(boolean showPhoneEmailFields) {
+        if (showPhoneEmailFields) {
+            saveNewCardLayout.setVisibility(VISIBLE);
+        } else {
+            saveNewCardLayout.setVisibility(View.GONE);
+        }
+    }
+
     private void onSavedCardSelected(SavedCard savedCard) {
         selectedSavedCard = savedCard;
         chargeType = SAVED_CARD_CHARGE;

rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiContract.java

@@ -33,6 +33,8 @@ interface View extends CardContract.CardInteractor {
         void showCardSavingOption(boolean b);
 
         void setHasSavedCards(boolean b);
+
+        void setSavedCardsLayoutVisibility(boolean showPhoneEmailFields);
     }
 
     interface UserActionsListener extends CardContract.CardPaymentHandler {
@@ -45,6 +47,8 @@ interface UserActionsListener extends CardContract.CardPaymentHandler {
 
         void init(RavePayInitializer ravePayInitializer);
 
+        void onSavedCardSwitchSwitchedOn(RavePayInitializer ravePayInitializer);
+
         void onDataCollected(HashMap<String, ViewObject> dataHashMap);
 
         void saveCardToSharedPreferences(List<SavedCard> cards, String phoneNumber, String publicKey);

rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiPresenter.java

@@ -288,16 +288,8 @@ public void saveCardToSharedPreferences(List<SavedCard> cards, String phoneNumbe
 
     @Override
     public void retrieveSavedCardsFromMemory(String phoneNumber, String publicKey) {
-        if (phoneNumber != null)
-            if (!phoneNumber.isEmpty())
-                savedCards = sharedManager.getSavedCards(phoneNumber, publicKey);
-    }
-
-    private void retrievePhoneNumberFromMemory(RavePayInitializer ravePayInitializer) {
-        String phoneNumber = sharedManager.fetchPhoneNumber();
-        if (ravePayInitializer.getPhoneNumber() == null || ravePayInitializer.getPhoneNumber().isEmpty()) {
-            ravePayInitializer.setPhoneNumber(phoneNumber);
-        }
+        if (phoneNumber != null && !phoneNumber.isEmpty())
+            savedCards = sharedManager.getSavedCards(phoneNumber, publicKey);
     }
 
     @Override
@@ -306,8 +298,9 @@ public void checkForSavedCardsInMemory(RavePayInitializer ravePayInitializer) {
             savedCards = new ArrayList<>();
         }
 
-        retrievePhoneNumberFromMemory(ravePayInitializer);
-        retrieveSavedCardsFromMemory(ravePayInitializer.getPhoneNumber(), ravePayInitializer.getPublicKey());
+        if(ravePayInitializer.getPhoneNumber().equals(sharedManager.fetchPhoneNumber())){
+            retrieveSavedCardsFromMemory(ravePayInitializer.getPhoneNumber(), ravePayInitializer.getPublicKey());
+        }
 
         if (!savedCards.isEmpty()) {
             mView.setHasSavedCards(true);
@@ -325,6 +318,15 @@ public void onAttachView(CardUiContract.View view) {
         this.mView = view;
     }
 
+
+    @Override
+    public void onSavedCardSwitchSwitchedOn(RavePayInitializer ravePayInitializer) {
+        boolean shouldHideSavedCardsLayout = ravePayInitializer.isUsePhoneAndEmailSuppliedToSaveCards() &&
+                emailValidator.isEmailValid(ravePayInitializer.getEmail()) &&
+                (ravePayInitializer.getPhoneNumber() != null && !ravePayInitializer.getPhoneNumber().isEmpty());
+        mView.setSavedCardsLayoutVisibility(!shouldHideSavedCardsLayout);
+    }
+
     @Override
     public void init(RavePayInitializer ravePayInitializer) {
 

rave_android/src/main/java/com/flutterwave/raveandroid/card/NullUiCardView.java

@@ -46,6 +46,11 @@ public void onSavedCardsLookupFailed(String message) {
 
     }
 
+    @Override
+    public void setSavedCardsLayoutVisibility(boolean showPhoneEmailFields) {
+
+    }
+
     @Override
     public void showSavedCardsLayout(List<SavedCard> savedCardsList) {
 

rave_cache/src/main/java/com/flutterwave/raveandroid/rave_cache/SharedPrefsRepo.java

@@ -96,4 +96,8 @@ private void savePhoneNumber(String phoneNumber) {
     public String fetchPhoneNumber() {
         return sharedPreferences.getString(PHONE_NUMBER, "");
     }
+
+    public void clear(){
+        editor.clear().apply();
+    }
 }