remove hard references of secretkey from RavePayActivity

Author: biodunalfet

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

@@ -63,9 +63,9 @@ interface View {
     }
 
     interface UserActionsListener {
-        void chargeCard(Payload payload);
+        void chargeCard(Payload payload, String secretKey);
 
-        void chargeCardWithSuggestedAuthModel(Payload payload, String pin, String authModel);
+        void chargeCardWithSuggestedAuthModel(Payload payload, String zipOrPin, String authModel, String secretKey);
 
         void validateCardCharge(String flwRef, String otp, String PBFPubKey);
 

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

@@ -442,7 +442,7 @@ public void onClick(View v) {
                     pinTil.setError("Enter a valid pin");
                 }
                 else {
-                    presenter.chargeCardWithSuggestedAuthModel(payload, pin, PIN);
+                    presenter.chargeCardWithSuggestedAuthModel(payload, pin, PIN, ravePayInitializer.getSecretKey());
                 }
             }
         });
@@ -705,7 +705,7 @@ public void onClick(DialogInterface dialog, int which) {
                 dialog.dismiss();
 
                 if (why == RaveConstants.MANUAL_CARD_CHARGE) {
-                    presenter.chargeCard(payload);
+                    presenter.chargeCard(payload, ravePayInitializer.getSecretKey());
                 }
                 else if (why == RaveConstants.TOKEN_CHARGE) {
                     presenter.chargeToken(payload);
@@ -775,7 +775,7 @@ public void onClick(View v) {
                 }
                 else {
                     dialog.dismiss();
-                    presenter.chargeCardWithSuggestedAuthModel(payload, zip, AVS_VBVSECURECODE);
+                    presenter.chargeCardWithSuggestedAuthModel(payload, zip, AVS_VBVSECURECODE, ravePayInitializer.getSecretKey());
                 }
             }
         });

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

@@ -7,7 +7,6 @@
 import com.flutterwave.raveandroid.RaveConstants;
 import com.flutterwave.raveandroid.FeeCheckRequestBody;
 import com.flutterwave.raveandroid.Payload;
-import com.flutterwave.raveandroid.RavePayActivity;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.Utils;
 import com.flutterwave.raveandroid.data.Callbacks;
@@ -40,10 +39,10 @@ public CardPresenter(Context context, CardContract.View mView) {
     }
 
     @Override
-    public void chargeCard(final Payload payload) {
+    public void chargeCard(final Payload payload, String secretKey) {
 
         String cardRequestBodyAsString = Utils.convertChargeRequestPayloadToJson(payload);
-        String encryptedCardRequestBody = Utils.getEncryptedData(cardRequestBodyAsString, RavePayActivity.getSecretKey()).trim().replaceAll("\\n", "");
+        String encryptedCardRequestBody = Utils.getEncryptedData(cardRequestBodyAsString, secretKey).trim().replaceAll("\\n", "");
 
 //        Log.d("encrypted", encryptedCardRequestBody);
 
@@ -102,8 +101,9 @@ public void onError(String message, String responseAsJSONString) {
         });
     }
 
+
     @Override
-    public void chargeCardWithSuggestedAuthModel(Payload payload, String zipOrPin, String authModel) {
+    public void chargeCardWithSuggestedAuthModel(Payload payload, String zipOrPin, String authModel, String secretKey) {
 
         if (authModel.equalsIgnoreCase(AVS_VBVSECURECODE)) {
             payload.setBillingzip(zipOrPin);
@@ -115,7 +115,7 @@ else if (authModel.equalsIgnoreCase(PIN)){
         payload.setSuggestedAuth(authModel);
 
         String cardRequestBodyAsString = Utils.convertChargeRequestPayloadToJson(payload);
-        String encryptedCardRequestBody = Utils.getEncryptedData(cardRequestBodyAsString, RavePayActivity.getSecretKey()).trim().replaceAll("\\n", "");
+        String encryptedCardRequestBody = Utils.getEncryptedData(cardRequestBodyAsString, secretKey).trim().replaceAll("\\n", "");
 
 //        Log.d("encrypted", encryptedCardRequestBody);
 
@@ -219,6 +219,7 @@ public void requeryTx(final String flwRef, final String SECKEY, final boolean sh
         body.setSECKEY(SECKEY);
 
         mView.showFullProgressIndicator(true);
+        mView.showProgressIndicator(true);
 
         new NetworkRequestImpl().requeryTx(body, new Callbacks.OnRequeryRequestComplete() {
             @Override