Skip to content

Commit 6ae1e69

Browse files
biodunalfetbiodunalfet
committed
complete merge
2 parents 03e0014 + 6184de7 commit 6ae1e69

23 files changed

+99
-120
lines changed

‎app/src/main/java/com/flutterwave/rave_android/MainActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.flutterwave.rave_android;
22

33
import android.content.Intent;
4+
import android.os.Bundle;
45
import android.support.v7.app.AlertDialog;
56
import android.support.v7.app.AppCompatActivity;
6-
import android.os.Bundle;
77
import android.support.v7.widget.SwitchCompat;
88
import android.util.Log;
99
import android.view.LayoutInflater;
@@ -274,7 +274,7 @@ public void onClick(View view) {
274274
addVendorBtn.setOnClickListener(new View.OnClickListener(){
275275
@Override
276276
public void onClick(View view) {
277-
Boolean valid = true;
277+
boolean valid = true;
278278
String vendorRef = vendorReferenceET.getText().toString().trim();
279279
String vendorRatio = vendorRatioET.getText().toString().trim();
280280

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

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,37 +39,42 @@ public class RaveConstants {
3939
public static String fieldCvv = "cvv";
4040
public static String fieldCardExpiry = "cardExpiry";
4141
public static String fieldcardNoStripped = "cardNoStripped";
42+
public static String date_of_birth = "Date of Birth";
43+
public static String isInternetBanking = "bankcode";
44+
45+
public static String success = "success";
46+
public static String noResponse = "No response data was returned";
47+
48+
public static String response = "response";
49+
public static String mtn = "mtn";
50+
public static String tigo = "tigo";
51+
public static String vodafone = "vodafone";
52+
53+
public static String tokenNotFound = "token not found";
54+
public static String expired = "expired";
55+
public static String tokenExpired = "Token expired";
56+
public static String cardNoStripped = "cardNoStripped";
4257
public static String validAmountPrompt = "Enter a valid amount";
4358
public static String validPhonePrompt = "Enter a valid number";
4459
public static String validEmailPrompt = "Enter a valid Email";
45-
public static String date_of_birth = "Date of Birth";
60+
public static String charge = "You will be charged a total of";
61+
public static String askToContinue = ". Do you want to continue?";
62+
public static String yes = "YES";
63+
public static String no = "NO";
64+
public static String cancel = "CANCEL";
65+
public static String checkStatus = "Checking transaction status. Please wait";
4666
public static String transactionError = "An error occurred while retrieving transaction fee";
4767
public static String validCvvPrompt = "Enter a valid cvv";
4868
public static String validExpiryDatePrompt = "Enter a valid expiry date";
4969
public static String validCreditCardPrompt = "Enter a valid credit card number";
5070
public static String validVoucherPrompt = "Enter a valid voucher code";
5171
public static String validNetworkPrompt = "Select a network";
52-
public static String isInternetBanking = "bankcode";
5372
public static String invalidChargeCode = "Invalid charge response code";
5473
public static String invalidCharge = "Invalid charge card response";
55-
public static String success = "success";
56-
public static String noResponse = "No response data was returned";
74+
public static String unknownAuthmsg = "Unknown Auth Model";
75+
public static String unknownResCodemsg = "Unknown charge response code";
76+
public static String no_authurl_was_returnedmsg = "No authUrl was returned";
77+
public static String no_response_data_was_returnedmsg = "No response data was returned";
5778
public static String wait = "Please wait...";
5879
public static String cancelPayment = "CANCEL PAYMENT";
59-
public static String response = "response";
60-
public static String charge = "You will be charged a total of";
61-
public static String askToContinue = ". Do you want to continue?";
62-
public static String yes = "YES";
63-
public static String no = "NO";
64-
public static String cancel = "CANCEL";
65-
public static String checkStatus = "Checking transaction status. Please wait";
66-
public static String mtn = "mtn";
67-
public static String tigo = "tigo";
68-
public static String vodafone = "vodafone";
69-
public static String unknownAuth = "Unknown Auth Model";
70-
public static String unknownResCode = "Unknown charge response code";
71-
public static String tokenNotFound = "token not found";
72-
public static String expired = "expired";
73-
public static String tokenExpired = "Token expired";
74-
public static String cardNoStripped = "cardNoStripped";
7580
}

‎raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.parceler.Parcel;
44

5-
import java.util.List;
6-
75
/**
86
* Created by hamzafetuga on 21/07/2017.
97
*/
@@ -239,7 +237,9 @@ public void setPayment_plan(String payment_plan) {
239237
this.payment_plan = payment_plan;
240238
}
241239

242-
public void setPreAuth( Boolean isPreAuth){ this.isPreAuth = isPreAuth; }
240+
public void setPreAuth(boolean isPreAuth) {
241+
this.isPreAuth = isPreAuth;
242+
}
243243

244244
public boolean getIsPreAuth() { return isPreAuth; }
245245

‎raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public RavePayManager setSubAccounts(List<SubAccount> subAccounts){
106106
return this;
107107
}
108108

109-
public RavePayManager showStagingLabel(Boolean showStagingLabel){
109+
public RavePayManager showStagingLabel(boolean showStagingLabel) {
110110
this.showStagingLabel = showStagingLabel;
111111
return this;
112112
}
@@ -181,7 +181,7 @@ public void initialize() {
181181
}
182182
}
183183

184-
public RavePayManager shouldDisplayFee(Boolean displayFee){
184+
public RavePayManager shouldDisplayFee(boolean displayFee) {
185185
this.displayFee = displayFee;
186186
return this;
187187
}

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,15 @@
1919

2020
import java.lang.reflect.Type;
2121
import java.nio.charset.Charset;
22+
import java.nio.charset.StandardCharsets;
2223
import java.security.GeneralSecurityException;
2324
import java.security.KeyFactory;
2425
import java.security.MessageDigest;
25-
import java.security.NoSuchAlgorithmException;
2626
import java.security.PublicKey;
27-
import java.security.spec.MGF1ParameterSpec;
2827
import java.security.spec.X509EncodedKeySpec;
2928
import java.util.List;
3029

3130
import javax.crypto.Cipher;
32-
import javax.crypto.NoSuchPaddingException;
33-
import javax.crypto.SecretKey;
34-
import javax.crypto.spec.OAEPParameterSpec;
35-
import javax.crypto.spec.PSource;
3631
import javax.crypto.spec.SecretKeySpec;
3732

3833
/**
@@ -90,7 +85,7 @@ public static boolean wasTxSuccessful(RavePayInitializer ravePayInitializer, Str
9085
return false;
9186
}
9287

93-
private static Boolean areAmountsSame(String amount1, String amount2) {
88+
private static boolean areAmountsSame(String amount1, String amount2) {
9489
Double number1 = Double.parseDouble(amount1);
9590
Double number2 = Double.parseDouble(amount2);
9691

@@ -223,12 +218,12 @@ public static String decryptRef(String key, String encryptedRef) {
223218
}
224219

225220
private static String encrypt(String data, String key) throws Exception {
226-
byte[] keyBytes = key.getBytes(UTF_8);
221+
byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
227222
SecretKeySpec skey = new SecretKeySpec(keyBytes, ALGORITHM);
228223
Cipher cipher = Cipher.getInstance(TRANSFORMATION);
229224

230225
cipher.init(Cipher.ENCRYPT_MODE, skey);
231-
byte[] plainTextBytes = data.getBytes(UTF_8);
226+
byte[] plainTextBytes = data.getBytes(StandardCharsets.UTF_8);
232227
byte[] buf = cipher.doFinal(plainTextBytes);
233228
return Base64.encodeToString(buf, Base64.DEFAULT);
234229

@@ -239,7 +234,7 @@ private static String getMd5(String md5) throws Exception {
239234
byte[] array = md.digest(md5.getBytes(CHARSET_NAME));
240235
StringBuffer sb = new StringBuffer();
241236
for (int i = 0; i < array.length; ++i) {
242-
sb.append(Integer.toHexString((array[i] & 0xFF) | 0x100).substring(1, 3));
237+
sb.append(Integer.toHexString((array[i] & 0xFF) | 0x100), 1, 3);
243238
}
244239
return sb.toString();
245240
}
@@ -300,7 +295,7 @@ public static boolean isValidLuhnNumber(String number) {
300295
}
301296

302297
String reversedNumber = new StringBuffer(number).reverse().toString();
303-
char reversedCharArray[] = reversedNumber.toCharArray();
298+
char[] reversedCharArray = reversedNumber.toCharArray();
304299
int luhnSum = 0;
305300

306301
// Double the value of every second digit from the right

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.flutterwave.raveandroid.FeeCheckRequestBody;
99
import com.flutterwave.raveandroid.Payload;
1010
import com.flutterwave.raveandroid.PayloadBuilder;
11-
import com.flutterwave.raveandroid.R;
1211
import com.flutterwave.raveandroid.RaveConstants;
1312
import com.flutterwave.raveandroid.RavePayInitializer;
1413
import com.flutterwave.raveandroid.Utils;
@@ -232,7 +231,7 @@ public void verifyRequeryResponseStatus(RequeryResponse response, String respons
232231
@Override
233232
public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
234233

235-
Boolean valid = true;
234+
boolean valid = true;
236235

237236
int amountID = dataHashMap.get(RaveConstants.fieldAmount).getViewId();
238237
String amount = dataHashMap.get(RaveConstants.fieldAmount).getData();
@@ -345,8 +344,8 @@ public void onDetachView() {
345344
public void init(RavePayInitializer ravePayInitializer) {
346345

347346
if (ravePayInitializer!=null) {
348-
Boolean isEmailValid = emailValidator.isEmailValid(ravePayInitializer.getEmail());
349-
Boolean isAmountValid = amountValidator.isAmountValid(ravePayInitializer.getAmount());
347+
boolean isEmailValid = emailValidator.isEmailValid(ravePayInitializer.getEmail());
348+
boolean isAmountValid = amountValidator.isAmountValid(ravePayInitializer.getAmount());
350349
if (isEmailValid) {
351350
mView.onEmailValidated(ravePayInitializer.getEmail(), View.GONE);
352351
} else {

‎raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,13 @@
1616
import android.widget.TextView;
1717
import android.widget.Toast;
1818

19-
import com.flutterwave.raveandroid.AVSVBVFragment;
20-
import com.flutterwave.raveandroid.OTPFragment;
21-
import com.flutterwave.raveandroid.PinFragment;
2219
import com.flutterwave.raveandroid.R;
23-
import com.flutterwave.raveandroid.RaveConstants;
2420
import com.flutterwave.raveandroid.RavePayActivity;
2521
import com.flutterwave.raveandroid.RavePayInitializer;
26-
import com.flutterwave.raveandroid.Utils;
2722
import com.flutterwave.raveandroid.VerificationActivity;
2823
import com.flutterwave.raveandroid.WebFragment;
2924
import com.flutterwave.raveandroid.responses.RequeryResponse;
3025

31-
import static com.flutterwave.raveandroid.RaveConstants.PIN;
3226

3327
/**
3428
* A simple {@link Fragment} subclass.
@@ -87,16 +81,16 @@ private void initializeViews() {
8781
public void showFee(final String authUrl, final String flwRef, final String charge_amount, final String currency) {
8882

8983
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
90-
builder.setMessage(RaveConstants.charge + charge_amount + currency + RaveConstants.askToContinue);
91-
builder.setPositiveButton(RaveConstants.yes, new DialogInterface.OnClickListener() {
84+
builder.setMessage(getResources().getString(R.string.charge) + charge_amount + currency + getResources().getString(R.string.askToContinue));
85+
builder.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
9286
@Override
9387
public void onClick(DialogInterface dialog, int which) {
9488
dialog.dismiss();
9589

9690
presenter.onFeeConfirmed(authUrl, flwRef);
9791

9892
}
99-
}).setNegativeButton(RaveConstants.no, new DialogInterface.OnClickListener() {
93+
}).setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() {
10094
@Override
10195
public void onClick(DialogInterface dialog, int which) {
10296
dialog.dismiss();

‎raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchPresenter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amo
5656
double amnt = Double.parseDouble(amount);
5757

5858
if (amnt <= 0) {
59-
mView.showAmountError(RaveConstants.validAmountPrompt);
59+
mView.showAmountError(context.getResources().getString(R.string.validAmountPrompt));
6060
}
6161
else {
6262
ravePayInitializer.setAmount(amnt);
@@ -65,7 +65,7 @@ public void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amo
6565
}
6666
catch (Exception e) {
6767
e.printStackTrace();
68-
mView.showAmountError(RaveConstants.validAmountPrompt);
68+
mView.showAmountError(context.getResources().getString(R.string.validAmountPrompt));
6969
}
7070
}
7171

@@ -132,12 +132,12 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
132132
}
133133
}
134134
else {
135-
mView.onPaymentError("No authUrl was returned");
135+
mView.onPaymentError(context.getResources().getString(R.string.no_authurl_was_returnedmsg));
136136
}
137137

138138
}
139139
else {
140-
mView.onPaymentError("No response data was returned");
140+
mView.onPaymentError(RaveConstants.no_response_data_was_returnedmsg);
141141
}
142142

143143
}

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import java.util.HashMap;
4747
import java.util.List;
4848

49-
import static android.view.View.GONE;
5049
import static com.flutterwave.raveandroid.RaveConstants.PIN;
5150

5251

@@ -181,12 +180,7 @@ public void onNoAuthUsed(String flwRef, String publicKey) {
181180

182181
@Override
183182
public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
184-
185-
String cardNoStripped = dataHashMap.get(RaveConstants.cardNoStripped).getData();
186-
//CheckSaveCard(cardNoStripped);
187-
188183
presenter.processTransaction(dataHashMap, ravePayInitializer);
189-
190184
}
191185

192186
@Override
@@ -264,7 +258,7 @@ public void showProgressIndicator(boolean active) {
264258
if (progessDialog == null) {
265259
progessDialog = new ProgressDialog(getActivity());
266260
progessDialog.setCanceledOnTouchOutside(false);
267-
progessDialog.setMessage(RaveConstants.wait);
261+
progessDialog.setMessage(getResources().getString(R.string.wait));
268262
}
269263

270264
if (active && !progessDialog.isShowing()) {
@@ -521,8 +515,8 @@ public void onTokenRetrievalError(String s) {
521515
public void displayFee(String charge_amount, final Payload payload, final int why) {
522516

523517
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
524-
builder.setMessage((RaveConstants.charge + charge_amount + ravePayInitializer.getCurrency() + RaveConstants.askToContinue));
525-
builder.setPositiveButton(RaveConstants.yes , new DialogInterface.OnClickListener() {
518+
builder.setMessage(getResources().getString(R.string.charge) + charge_amount + ravePayInitializer.getCurrency() + getResources().getString(R.string.askToContinue));
519+
builder.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
526520
@Override
527521
public void onClick(DialogInterface dialog, int which) {
528522
dialog.dismiss();
@@ -534,7 +528,7 @@ public void onClick(DialogInterface dialog, int which) {
534528
}
535529

536530
}
537-
}).setNegativeButton(RaveConstants.no , new DialogInterface.OnClickListener() {
531+
}).setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() {
538532
@Override
539533
public void onClick(DialogInterface dialog, int which) {
540534
dialog.dismiss();

0 commit comments

Comments
 (0)