implement uniform payment flow for all payment methods

Author: biodunalfet

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

@@ -15,49 +15,75 @@
 /**
  * A simple {@link Fragment} subclass.
  */
-public class OTPFragment extends Fragment {
+public class OTPFragment extends Fragment implements View.OnClickListener {
+
     public static final String EXTRA_OTP = "extraOTP";
-    public static final String EXTRA_CHARGE_MESSAGE = "extraChargeMessage";
-    String otp;
+    TextInputEditText otpEt;
+    TextInputLayout otpTil;
+    TextView chargeMessage;
     Button otpButton;
 
+    public static final String EXTRA_CHARGE_MESSAGE = "extraChargeMessage";
+    View v;
+    String otp;
 
     public OTPFragment() {
         // Required empty public constructor
     }
 
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        final View v = inflater.inflate(R.layout.fragment_ot, container, false);
-        final TextInputLayout otpTil = (TextInputLayout) v.findViewById(R.id.otpTil);
-        final TextInputEditText otpEt = (TextInputEditText) v.findViewById(R.id.otpEv);
-        otpButton = (Button) v.findViewById(R.id.otpButton);
-        TextView chargeMessage = (TextView) v.findViewById(R.id.otpChargeMessage);
-        if(getArguments().containsKey(EXTRA_CHARGE_MESSAGE)){
-            chargeMessage.setText(getArguments().getString(EXTRA_CHARGE_MESSAGE));
-        }
-        otpButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                otp = otpEt.getText().toString();
-
-                otpTil.setError(null);
-                otpTil.setErrorEnabled(false);
-
-                if (otp.length() < 1) {
-                    otpTil.setError("Enter a valid one time password");
-                } else {
-                    goBack();
-                }
-            }
-        });
+
+        v = inflater.inflate(R.layout.fragment_ot, container, false);
+
+        initializeViews();
+
+        setChargeMessage();
+
+        setListeners();
 
         return v;
     }
 
+    private void setListeners() {
+        otpButton.setOnClickListener(this);
+    }
+
+    private void initializeViews() {
+        otpTil = v.findViewById(R.id.otpTil);
+        otpEt = v.findViewById(R.id.otpEv);
+        otpButton = v.findViewById(R.id.otpButton);
+        chargeMessage = v.findViewById(R.id.otpChargeMessage);
+    }
+
+    @Override
+    public void onClick(View view) {
+        int i = view.getId();
+        if (i == R.id.otpButton) {
+            clearErrors();
+            otp = otpEt.getText().toString();
+            if (otp.length() < 1) {
+                otpTil.setError("Enter a valid one time password");
+            } else {
+                goBack();
+            }
+        }
+    }
+
+    private void clearErrors() {
+        otpTil.setErrorEnabled(false);
+        otpTil.setError(null);
+    }
+
+    private void setChargeMessage() {
+        if (getArguments() != null) {
+            if (getArguments().containsKey(EXTRA_CHARGE_MESSAGE)) {
+                chargeMessage.setText(getArguments().getString(EXTRA_CHARGE_MESSAGE));
+            }
+        }
+    }
+
     public void goBack(){
         Intent intent = new Intent();
         intent.putExtra(EXTRA_OTP, otp);
@@ -68,5 +94,4 @@ public void goBack(){
     }
 
 
-
 }

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

@@ -20,9 +20,13 @@ public class RaveConstants {
     public static String VBV = "VBVSECURECODE";
     public static String GTB_OTP = "GTB_OTP";
     public static String ACCESS_OTP = "ACCESS_OTP";
+    public static String NG = "NG";
+    public static String NGN = "NGN";
+    public static String UGX = "UGX";
     public static String NOAUTH = "NOAUTH";
     public static String PIN = "PIN";
     public static String AVS_VBVSECURECODE = "AVS_VBVSECURECODE";
+    public static String enterOTP = "Enter your one time password (OTP)";
     public static String NOAUTH_INTERNATIONAL = "NOAUTH_INTERNATIONAL";
     public static String RAVEPAY = "ravepay";
     public static String RAVE_PARAMS = "raveparams";
@@ -47,6 +51,11 @@ public class RaveConstants {
 
     public static String success = "success";
     public static String noResponse = "No response data was returned";
+    public static String invalidAccountNoMessage = "Enter a valid account number";
+    public static String invalidDateOfBirthMessage = "Enter a valid date of birth";
+    public static String invalidBvnMessage = "Enter a valid BVN";
+    public static String invalidBankCodeMessage = "You need to select bank";
+    public static String defaultAccounNumber = "0000000000";
 
     public static String response = "response";
     public static String mtn = "mtn";
@@ -77,7 +86,6 @@ public class RaveConstants {
     public static String unknownAuthmsg = "Unknown Auth Model";
     public static String unknownResCodemsg = "Unknown charge response code";
     public static String no_authurl_was_returnedmsg = "No authUrl was returned";
-    public static String no_response_data_was_returnedmsg = "No response data was returned";
     public static String wait = "Please wait...";
     public static String cancelPayment = "CANCEL PAYMENT";
 }

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

@@ -193,10 +193,13 @@ public static PublicKey getKey(String key) {
     }
 
     public static String getEncryptedData(String unEncryptedString, String encryptionKey) {
-        try {
-            return encrypt(unEncryptedString, encryptionKey);
-        } catch (Exception e) {
-            e.printStackTrace();
+
+        if (unEncryptedString != null && encryptionKey != null) {
+            try {
+                return encrypt(unEncryptedString, encryptionKey);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         return null;
     }

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

@@ -1,8 +1,6 @@
 package com.flutterwave.raveandroid.account;
 
 
-import android.app.Activity;
-
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.ViewObject;
@@ -35,7 +33,7 @@ interface View {
 
         void onPaymentFailed(String status, String responseAsJSONString);
 
-        void onValidateSuccessful(String flwRef, String responseAsJSONString);
+        void onValidationSuccessful(String flwRef, String responseAsJSONString);
 
         void onValidateError(String message, String responseAsJSONString);
 
@@ -57,11 +55,11 @@ interface View {
 
         void onAmountValidated(String amountToSet, int visibility);
 
-        void showDateOfBirth(int whatToShow);
+        void showDateOfBirth(int isVisible);
 
-        void showBVN(int whatToShow);
+        void showBVN(int isVisible);
 
-        void showInternetBankingSelected(int whatToShow);
+        void showAccountNumberField(int isVisible);
     }
 
     interface UserActionsListener {
@@ -85,7 +83,7 @@ interface UserActionsListener {
 
         void init(RavePayInitializer ravePayInitializer);
 
-        void onInternetBankingValidated(Bank bank);
+        void onBankSelected(Bank bank);
     }
 
 }