implement new gtb_otp auth model

Author: biodunalfet

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

@@ -14,6 +14,7 @@ public class RaveConstants {
     public static String STAGING_URL = "http://flw-pms-dev.eu-west-1.elasticbeanstalk.com";
     public static String LIVE_URL = "https://rave-api.herokuapp.com";
     public static String VBV = "VBVSECURECODE";
+    public static String GTB_OTP = "GTB_OTP";
     public static String PIN = "PIN";
     public static String AVS_VBVSECURECODE = "AVS_VBVSECURECODE";
     public static String RAVEPAY = "ravepay";

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

@@ -23,7 +23,7 @@ interface View {
 
         void showToast(String message);
 
-        void showOTPLayout(String flwRef);
+        void showOTPLayout(String flwRef, String chargeResponseMessage);
 
         void onValidateSuccessful(String message, String responseAsString);
 

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

@@ -94,6 +94,7 @@ public class CardFragment extends Fragment implements View.OnClickListener, Card
     View v;
     Button savedCardBtn;
     String cardFirst6;
+    TextView otpInstructionsTv;
     String cardLast4;
     boolean shouldISaveThisCard = false;
 
@@ -126,6 +127,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         webView = (WebView) v.findViewById(R.id.rave_webview);
         pcidss_tv = (TextView) v.findViewById(R.id.rave_pcidss_compliant_tv);
         progressContainer = (FrameLayout) v.findViewById(R.id.rave_progressContainer);
+        otpInstructionsTv = (TextView) v.findViewById(R.id.otp_instructions_tv);
 
         ravePayInitializer = ((RavePayActivity) getActivity()).getRavePayInitializer();
 
@@ -456,11 +458,13 @@ private void dismissDialog() {
     /**
      * If an OTP is required, this method shows the dialog that receives it
      * @param flwRef
+     * @param chargeResponseMessage
      */
     @Override
-    public void showOTPLayout(String flwRef) {
+    public void showOTPLayout(String flwRef, String chargeResponseMessage) {
         this.flwRef = flwRef;
         dismissDialog();
+        otpInstructionsTv.setText(chargeResponseMessage);
         bottomSheetBehaviorOTP.setState(BottomSheetBehavior.STATE_EXPANDED);
     }
 

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

@@ -78,12 +78,20 @@ else if (suggested_auth.equals(AVS_VBVSECURECODE)) {
                     else {
                         String authModelUsed = response.getData().getAuthModelUsed();
 
-                        if (authModelUsed.equalsIgnoreCase(RaveConstants.VBV)) {
-                            String authUrlCrude = response.getData().getAuthurl();
-                            String flwRef = response.getData().getFlwRef();
-
-                            mView.onVBVAuthModelUsed(authUrlCrude, flwRef);
-
+                        if (authModelUsed != null) {
+
+                            if (authModelUsed.equalsIgnoreCase(RaveConstants.VBV)) {
+                                String authUrlCrude = response.getData().getAuthurl();
+                                String flwRef = response.getData().getFlwRef();
+
+                                mView.onVBVAuthModelUsed(authUrlCrude, flwRef);
+                            }
+                            else if (authModelUsed.equalsIgnoreCase(RaveConstants.GTB_OTP)) {
+                                String flwRef = response.getData().getFlwRef();
+                                String chargeResponseMessage = response.getData().getChargeResponseMessage();
+                                chargeResponseMessage = chargeResponseMessage == null ? "Enter your one  time password (OTP)" : chargeResponseMessage;
+                                mView.showOTPLayout(flwRef, chargeResponseMessage);
+                            }
                         }
                     }
                 }
@@ -142,7 +150,10 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
                     else if (chargeResponseCode.equalsIgnoreCase("02")) {
                         String authModelUsed = response.getData().getAuthModelUsed();
                         if (authModelUsed.equalsIgnoreCase(RaveConstants.PIN)) {
-                            mView.showOTPLayout(response.getData().getFlwRef());
+                            String flwRef = response.getData().getFlwRef();
+                            String chargeResponseMessage = response.getData().getChargeResponseMessage();
+                            chargeResponseMessage = (chargeResponseMessage == null || chargeResponseMessage.length() == 0) ? "Enter your one  time password (OTP)" : chargeResponseMessage;
+                            mView.showOTPLayout(flwRef, chargeResponseMessage);
                         }
                         else if (authModelUsed.equalsIgnoreCase(RaveConstants.AVS_VBVSECURECODE)){
                             String flwRef = response.getData().getFlwRef();

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

@@ -42,7 +42,7 @@ public void showToast(String message) {
     }
 
     @Override
-    public void showOTPLayout(String flwRef) {
+    public void showOTPLayout(String flwRef, String chargeResponseMessage) {
 
     }
 

raveandroid/src/main/res/layout/fragment_card.xml

@@ -232,6 +232,7 @@
             android:layout_marginRight="30dp"
             android:layout_marginBottom="30dp"
             android:layout_marginLeft="30dp"
+            android:id="@+id/otp_instructions_tv"
             android:text="@string/enter_your_one_ntime_password_otp"
             android:gravity="center_vertical|center_horizontal"
             />