Call showLoading on TransactionCallback when starting communicating with server (#154)

* Call `showLoading()` on
`TransactionCallback` when starting communicating with server

* Bump version to 3.3.1 (23)

Author: michael-paystack

build.gradle

@@ -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) {

example/src/main/java/co/paystack/example/MainActivity.java

@@ -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;
@@ -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) {
@@ -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();
                 }

gradle.properties

@@ -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

paystack/src/main/java/co/paystack/android/TransactionManager.java

@@ -133,7 +133,7 @@ public void onSuccess(TransactionInitResponse data) {
                         deviceId,
                         null
                 );
-                paystackRepository.processCardCharge(params, cardProcessCallback);
+                processCharge(params);
             }
 
             @Override
@@ -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 {
@@ -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);
@@ -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);
@@ -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) {
@@ -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);
     }
 
@@ -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"));
             }