fix secret key substitution

Author: [email protected]

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

@@ -30,7 +30,6 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.flutterwave.raveandroid.RaveConstants;
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.PayloadBuilder;
 import com.flutterwave.raveandroid.R;
@@ -124,6 +123,8 @@ public final String transformUrl(final Matcher match, String url) {
         otpLayout = (LinearLayout) v.findViewById(R.id.OTPBottomSheet);
         bottomSheetBehaviorOTP = BottomSheetBehavior.from(otpLayout);
 
+        ravePayInitializer = ((RavePayActivity) getActivity()).getRavePayInitializer();
+
         bankEt.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -149,13 +150,11 @@ public void onClick(View v) {
                 if (otp.length() < 1) {
                     otpTil.setError("Enter a valid one time password");
                 } else {
-                    presenter.validateAccountCharge(flwRef, otp, RaveConstants.PUBLIC_KEY);
+                    presenter.validateAccountCharge(flwRef, otp, ravePayInitializer.getPublicKey());
                 }
             }
         });
 
-        ravePayInitializer = ((RavePayActivity) getActivity()).getRavePayInitializer();
-
         if (Utils.isEmailValid(ravePayInitializer.getEmail())) {
             emailTil.setVisibility(GONE);
             emailEt.setText(ravePayInitializer.getEmail());
@@ -211,7 +210,8 @@ private void validateDetails() {
         }
 
         if (amount.length() == 0) {
-            amount = "50";
+            valid = false;
+            showToast("Amount is required");
         }
 
         if (selectedBank == null) {
@@ -235,6 +235,8 @@ private void validateDetails() {
 
             Payload body = builder.createBankPayload();
             body.setPhonenumber(phone);
+            body.setPBFSecKey(ravePayInitializer.getSecretKey());
+            body.setSECKEY(ravePayInitializer.getSecretKey());
 
             if (selectedBank.isInternetbanking()) {
                 body.setIs_internet_banking("1");

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

@@ -58,9 +58,9 @@ public void onError(String message) {
     public void chargeAccount(final Payload payload, final boolean internetBanking) {
 
         String cardRequestBodyAsString = Utils.convertChargeRequestPayloadToJson(payload);
-        String encryptedCardRequestBody = Utils.getEncryptedData(cardRequestBodyAsString, RaveConstants.PRIVATE_KEY);
+        String encryptedCardRequestBody = Utils.getEncryptedData(cardRequestBodyAsString, payload.getPBFSecKey());
 
-        Log.d("encrypted", encryptedCardRequestBody);
+//        Log.d("encrypted", encryptedCardRequestBody);
 
         ChargeRequestBody body = new ChargeRequestBody();
         body.setAlg("3DES-24");