Merge pull request #165 from jeremiahVaris/newRememberMe

Collect phone number from Card Fragment

Author: bolaware

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

@@ -72,6 +72,7 @@
 import static com.flutterwave.raveandroid.RaveConstants.fieldCardExpiry;
 import static com.flutterwave.raveandroid.RaveConstants.fieldCvv;
 import static com.flutterwave.raveandroid.RaveConstants.fieldEmail;
+import static com.flutterwave.raveandroid.RaveConstants.fieldPhone;
 import static com.flutterwave.raveandroid.RaveConstants.fieldcardNoStripped;
 import static com.flutterwave.raveandroid.verification.VerificationActivity.EXTRA_IS_STAGING;
 
@@ -120,6 +121,8 @@ public class CardFragment extends Fragment implements View.OnClickListener, Card
     private LinearLayout saveNewCardLayout;
     private EditText saveCardEmailEt;
     private EditText saveCardPhoneNoEt;
+    private TextInputLayout saveCardEmailTil;
+    private TextInputLayout saveCardPhoneNoTil;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -218,6 +221,8 @@ private void initializeViews() {
         saveCardSwitch = (SwitchCompat) v.findViewById(R.id.rave_saveCardSwitch);
         saveCardPhoneNoEt = (EditText) v.findViewById(R.id.save_card_phoneNoTV);
         saveCardEmailEt = (EditText) v.findViewById(R.id.save_card_emailTv);
+        saveCardPhoneNoTil = (TextInputLayout) v.findViewById(R.id.save_card_phoneNoTil);
+        saveCardEmailTil = (TextInputLayout) v.findViewById(R.id.save_card_emailTil);
         saveNewCardLayout = (LinearLayout) v.findViewById(R.id.rave_layout_for_saving_card);
 
 
@@ -260,6 +265,7 @@ private void collectData() {
         dataHashMap.put(fieldCvv, new ViewObject(cvvTil.getId(), cvvTv.getText().toString(), TextInputLayout.class));
         dataHashMap.put(fieldCardExpiry, new ViewObject(cardExpiryTil.getId(), cardExpiryTv.getText().toString(), TextInputLayout.class));
         dataHashMap.put(fieldcardNoStripped, new ViewObject(cardNoTil.getId(), cardNoTv.getText().toString(), TextInputLayout.class));
+        dataHashMap.put(fieldPhone, new ViewObject(saveCardPhoneNoTil.getId(), saveCardPhoneNoEt.getText().toString(), TextInputLayout.class));
 
         presenter.onDataCollected(dataHashMap);
     }
@@ -742,7 +748,7 @@ public void onPaymentSuccessful(String status, String flwRef, String responseAsJ
             presenter.setCardSaveInProgress(true);
             presenter.saveCardToRave(
                     ravePayInitializer.getPhoneNumber(),
-                    ravePayInitializer.getPhoneNumber(),
+                    ravePayInitializer.getEmail(),
                     flwRef,
                     ravePayInitializer.getPublicKey(),
                     responseAsJSONString);

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

@@ -65,6 +65,7 @@
 import static com.flutterwave.raveandroid.RaveConstants.fieldCardExpiry;
 import static com.flutterwave.raveandroid.RaveConstants.fieldCvv;
 import static com.flutterwave.raveandroid.RaveConstants.fieldEmail;
+import static com.flutterwave.raveandroid.RaveConstants.fieldPhone;
 import static com.flutterwave.raveandroid.RaveConstants.fieldcardNoStripped;
 import static com.flutterwave.raveandroid.RaveConstants.noResponse;
 import static com.flutterwave.raveandroid.RaveConstants.success;
@@ -402,6 +403,11 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
 
             ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(fieldAmount).getData()));
 
+            if (dataHashMap.containsKey(fieldPhone)) {
+                String phoneNumber = dataHashMap.get(fieldPhone).getData();
+                if (!phoneNumber.isEmpty()) ravePayInitializer.setPhoneNumber(phoneNumber);
+            }
+
             String deviceID = deviceIdGetter.getDeviceId();