Skip to content

Commit 92fa37d

Browse files
jeremiahAIjeremiahAI
authored
Merge pull request #8 from Flutterwave/master
Update to master
2 parents 5a7c9db + 80e0476 commit 92fa37d

38 files changed

+1579
-967
lines changed

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ The minimum supported SDK version is 15
3636
Add the `READ_PHONE_PERMISSION` and `INTERNET` permissions to your android manifest
3737

3838
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
39-
<uses-permission android:name="android.Manifest.permission.READ_PHONE_STATE" />
4039
<uses-permission android:name="android.permission.INTERNET" />
4140

4241
> **REQUIRED PERMISSION**

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

Lines changed: 3 additions & 3 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;
@@ -155,7 +155,7 @@ private void validateEntries() {
155155
amount = "0";
156156
}
157157

158-
//check for compulsory fields
158+
//isAmountValid for compulsory fields
159159
if (!Utils.isEmailValid(email)) {
160160
valid = false;
161161
emailEt.setError("A valid email is required");
@@ -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: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,54 @@ public class RaveConstants {
2727
public static int RAVE_REQUEST_CODE = 4199;
2828
public static int MANUAL_CARD_CHARGE = 403;
2929
public static int TOKEN_CHARGE = 24;
30+
public static String fieldAmount = "amount";
31+
public static String fieldPhone = "phone";
32+
public static String fieldEmail = "email";
33+
public static String fieldAccount = "account";
34+
public static String fieldVoucher = "voucher";
35+
public static String fieldNetwork = "network";
36+
public static String fieldBVN = "bvn";
37+
public static String fieldDOB = "dob";
38+
public static String fieldBankCode = "bankcode";
39+
public static String fieldCvv = "cvv";
40+
public static String fieldCardExpiry = "cardExpiry";
41+
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";
57+
public static String validAmountPrompt = "Enter a valid amount";
58+
public static String validPhonePrompt = "Enter a valid number";
59+
public static String validEmailPrompt = "Enter a valid Email";
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 transactionError = "An error occurred while retrieving transaction fee";
67+
public static String validCvvPrompt = "Enter a valid cvv";
68+
public static String validExpiryDatePrompt = "Enter a valid expiry date";
69+
public static String validCreditCardPrompt = "Enter a valid credit card number";
70+
public static String validVoucherPrompt = "Enter a valid voucher code";
71+
public static String validNetworkPrompt = "Select a network";
72+
public static String invalidChargeCode = "Invalid charge response code";
73+
public static String invalidCharge = "Invalid charge card response";
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";
78+
public static String wait = "Please wait...";
79+
public static String cancelPayment = "CANCEL PAYMENT";
3080
}

‎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/ViewObject.java‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package com.flutterwave.raveandroid;
2+
3+
public class ViewObject {
4+
5+
int viewId;
6+
String data;
7+
Class<?> viewType;
8+
9+
public ViewObject(int viewId, String data, Class<?> viewType) {
10+
this.viewId = viewId;
11+
this.data = data;
12+
this.viewType = viewType;
13+
}
14+
15+
public int getViewId() {
16+
return viewId;
17+
}
18+
19+
public void setViewId(int viewId) {
20+
this.viewId = viewId;
21+
}
22+
23+
public String getData() {
24+
return data;
25+
}
26+
27+
public void setData(String data) {
28+
this.data = data;
29+
}
30+
31+
32+
public Class<?> getViewType() {
33+
return viewType;
34+
}
35+
36+
public void setViewType(Class<?> viewType) {
37+
this.viewType = viewType;
38+
}
39+
40+
41+
}

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
package com.flutterwave.raveandroid.account;
22

33

4+
import android.app.Activity;
5+
46
import com.flutterwave.raveandroid.Payload;
57
import com.flutterwave.raveandroid.RavePayInitializer;
8+
import com.flutterwave.raveandroid.ViewObject;
69
import com.flutterwave.raveandroid.data.Bank;
710
import com.flutterwave.raveandroid.responses.RequeryResponse;
811

12+
import java.util.HashMap;
913
import java.util.List;
1014

1115
/**
@@ -42,6 +46,22 @@ interface View {
4246
void showFetchFeeFailed(String s);
4347

4448
void onRequerySuccessful(RequeryResponse response, String responseAsJSONString);
49+
50+
void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap);
51+
52+
void showFieldError(int viewID, String message, Class<?> viewtype);
53+
54+
void showGTBankAmountIssue();
55+
56+
void onEmailValidated(String emailToSet, int visibility);
57+
58+
void onAmountValidated(String amountToSet, int visibility);
59+
60+
void showDateOfBirth(int whatToShow);
61+
62+
void showBVN(int whatToShow);
63+
64+
void showInternetBankingSelected(int whatToShow);
4565
}
4666

4767
interface UserActionsListener {
@@ -58,6 +78,14 @@ interface UserActionsListener {
5878
void onDetachView();
5979

6080
void verifyRequeryResponseStatus(RequeryResponse response, String responseAsJSONString, RavePayInitializer ravePayInitializer);
81+
82+
void onDataCollected(HashMap<String, ViewObject> dataHashMap);
83+
84+
void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayInitializer ravePayInitializer);
85+
86+
void init(RavePayInitializer ravePayInitializer);
87+
88+
void onInternetBankingValidated(Bank bank);
6189
}
6290

6391
}

0 commit comments

Comments
 (0)