Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Call showLoading on TransactionCallback when starting communicating with server #154

Merged
merged 2 commits into from
Feb 16, 2023
Merged

Call showLoading on TransactionCallback when starting communicating with server #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46b1f11
Call `showLoading()` on
michael-paystack Feb 16, 2023
20047c6
Bump version to 3.3.1 (23)
michael-paystack Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ ext {
compileSdkVersion = 29
minSdkVersion = 16
targetSdkVersion = 29
versionCode = 22
versionCode = 23

buildToolsVersion = "29.0.2"
versionName = "3.3.0"
versionName = "3.3.1"
}

Object getEnvOrDefault(String propertyName, Object defaultValue) {
Expand Down
4 changes: 3 additions & 1 deletion example/src/main/java/co/paystack/example/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.app.ProgressDialog;
import android.os.AsyncTask;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
import android.view.View;
import android.widget.Button;
Expand Down Expand Up @@ -51,7 +52,7 @@ public class MainActivity extends AppCompatActivity {
private TextView mTextReference;
private Charge charge;
private Transaction transaction;

private static final String TAG = "MainActivity";

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand Down Expand Up @@ -213,6 +214,7 @@ public void beforeValidate(Transaction transaction) {

@Override
public void showLoading(Boolean isProcessing) {
Log.i(TAG, "Paystack SDK loading: " + isProcessing);
if (isProcessing) {
Toast.makeText(MainActivity.this, "Processing...", Toast.LENGTH_LONG).show();
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ android.useAndroidX=true
org.gradle.daemon=true
org.gradle.jvmargs=-Xmx2560m
GROUP=co.paystack.android
VERSION_NAME=3.3.0
VERSION_NAME=3.3.1
POM_DESCRIPTION=Android SDK for Paystack
POM_URL=https://github.com/PaystackHQ/paystack-android
POM_SCM_URL=https://github.com/PaystackHQ/paystack-android
Expand Down
21 changes: 17 additions & 4 deletions paystack/src/main/java/co/paystack/android/TransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public void onSuccess(TransactionInitResponse data) {
deviceId,
null
);
paystackRepository.processCardCharge(params, cardProcessCallback);
processCharge(params);
}

@Override
Expand All @@ -143,6 +143,7 @@ public void onError(@NotNull Throwable exception) {
}
};

transactionCallback.showLoading(true);
if (charge.getAccessCode() == null || charge.getAccessCode().isEmpty()) {
paystackRepository.initializeTransaction(publicKey, charge, deviceId, callback);
} else {
Expand Down Expand Up @@ -220,6 +221,7 @@ private void authenticateTransaction(ChargeParams chargeParams, ChargeResponse c

private void validateOtp(String token, ChargeParams chargeParams) {
try {
transactionCallback.showLoading(true);
paystackRepository.validateTransaction(chargeParams, token, cardProcessCallback);
} catch (Exception ce) {
Log.e(LOG_TAG, ce.getMessage(), ce);
Expand All @@ -229,6 +231,7 @@ private void validateOtp(String token, ChargeParams chargeParams) {

private void chargeWithAvs(Address address, ChargeParams chargeParams) {
try {
transactionCallback.showLoading(true);
paystackRepository.validateAddress(chargeParams, address, cardProcessCallback);
} catch (Exception e) {
Log.e(LOG_TAG, e.getMessage(), e);
Expand All @@ -240,7 +243,7 @@ private void reQueryChargeOnServer(ChargeParams chargeParams) {
try {
new CountDownTimer(5000, 5000) {
public void onFinish() {
paystackRepository.requeryTransaction(chargeParams, cardProcessCallback);
requeryTransaction(chargeParams);
}

public void onTick(long millisUntilFinished) {
Expand All @@ -252,10 +255,19 @@ public void onTick(long millisUntilFinished) {
}
}

private void requeryTransaction(ChargeParams chargeParams) {
transactionCallback.showLoading(true);
paystackRepository.requeryTransaction(chargeParams, cardProcessCallback);
}

private void processCharge(ChargeParams params) {
transactionCallback.showLoading(true);
paystackRepository.processCardCharge(params, cardProcessCallback);
}

private void notifyProcessingError(Throwable t) {
setProcessingOff();
transactionCallback.showLoading(false);

transactionCallback.onError(t, EMPTY_TRANSACTION);
}

Expand Down Expand Up @@ -338,7 +350,8 @@ protected String doInBackground(Void... params) {
protected void onPostExecute(String pin) {
super.onPostExecute(pin);
if (pin != null && (4 == pin.length())) {
paystackRepository.processCardCharge(chargeParams.addPin(Crypto.encrypt(pin)), cardProcessCallback);
ChargeParams params = chargeParams.addPin(Crypto.encrypt(pin));
processCharge(params);
} else {
notifyProcessingError(new Exception("PIN must be exactly 4 digits"));
}
Expand Down