Skip to content

Commit 23a679b

Browse files
committed
fix account payment auth url
add exceotion handler to showProgressIndicator for card and account
1 parent 4c54936 commit 23a679b

File tree

3 files changed

+33
-19
lines changed

3 files changed

+33
-19
lines changed

raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -364,17 +364,24 @@ public void onBankSelected(Bank b) {
364364
@Override
365365
public void showProgressIndicator(boolean active) {
366366

367-
if (getActivity().isFinishing()) { return; }
367+
try {
368+
if (getActivity().isFinishing()) {
369+
return;
370+
}
368371

369-
if (progessDialog == null) {
370-
progessDialog = new ProgressDialog(getActivity());
371-
progessDialog.setMessage("Please wait...");
372-
}
372+
if (progessDialog == null) {
373+
progessDialog = new ProgressDialog(getActivity());
374+
progessDialog.setMessage("Please wait...");
375+
}
373376

374-
if (active && !progessDialog.isShowing()) {
375-
progessDialog.show();
376-
} else {
377-
progessDialog.dismiss();
377+
if (active && !progessDialog.isShowing()) {
378+
progessDialog.show();
379+
} else {
380+
progessDialog.dismiss();
381+
}
382+
}
383+
catch (NullPointerException e) {
384+
e.printStackTrace();
378385
}
379386
}
380387

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.content.Context;
44
import android.util.Log;
5+
import android.webkit.URLUtil;
56

67
import com.flutterwave.raveandroid.FeeCheckRequestBody;
78
import com.flutterwave.raveandroid.Payload;
@@ -79,7 +80,7 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
7980
if (response.getData() != null) {
8081
String authUrlCrude = response.getData().getAuthurl();
8182
String flwRef = response.getData().getFlwRef();
82-
if (authUrlCrude != null && !authUrlCrude.equalsIgnoreCase("N/A")) {
83+
if (authUrlCrude != null && URLUtil.isValidUrl(authUrlCrude)) {
8384
mView.onDisplayInternetBankingPage(authUrlCrude, flwRef);
8485
}
8586
else {

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -461,17 +461,23 @@ private void clearErrors() {
461461
@Override
462462
public void showProgressIndicator(boolean active) {
463463

464-
if (getActivity().isFinishing()) { return; }
465-
if(progessDialog == null) {
466-
progessDialog = new ProgressDialog(getActivity());
467-
progessDialog.setMessage("Please wait...");
468-
}
464+
try {
465+
if (getActivity().isFinishing()) {
466+
return;
467+
}
468+
if (progessDialog == null) {
469+
progessDialog = new ProgressDialog(getActivity());
470+
progessDialog.setMessage("Please wait...");
471+
}
469472

470-
if (active && !progessDialog.isShowing()) {
471-
progessDialog.show();
473+
if (active && !progessDialog.isShowing()) {
474+
progessDialog.show();
475+
} else {
476+
progessDialog.dismiss();
477+
}
472478
}
473-
else {
474-
progessDialog.dismiss();
479+
catch (NullPointerException e) {
480+
e.printStackTrace();
475481
}
476482
}
477483

0 commit comments

Comments
 (0)