From a1218376b6d2c1af28b0a9ebcd71ec15c617ec22 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Wed, 20 Feb 2019 11:59:06 +0900 Subject: [PATCH] Penny test fixes --- .../pennytest/PennyTestPresenter.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestPresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestPresenter.java index 61d4710a..51dfa599 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestPresenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestPresenter.java @@ -124,7 +124,7 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera @Override protected void onConnectionNotEstablished(String message) { - view.showPopUpMessage(message,CustomAlertDialog.AlertType.NO_INTERNET,alertType->view.morphProgressBarIntoButton(null)); + view.showPopUpMessage(message,CustomAlertDialog.AlertType.NO_INTERNET,alertType->view.morphProgressBarIntoButton(null)); } } @@ -188,25 +188,35 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera updateFlagOnPennyTestAfterRequest(t.getId(),t.getData().getMsg()); if(hasRequestedInternally) view.updateDepositedMessage(t.getData().getMsg()); - view.showPopUpMessage(t.getData().getMsg(),CustomAlertDialog.AlertType.SUCCESS,null); + view.showPopUpMessage(t.getData().getMsg(),CustomAlertDialog.AlertType.SUCCESS,null); }); } else { - view.showPopUpMessage(t.getMsg(),CustomAlertDialog.AlertType.FAILED,alertType->view.morphProgressBarIntoButton(null)); + if(!hasRequestedInternally) + view.showPopUpMessage(t.getMsg(),CustomAlertDialog.AlertType.FAILED,alertType->view.morphProgressBarIntoButton(null)); + else + view.showPopUpMessage(t.getMsg(),CustomAlertDialog.AlertType.FAILED,alertType->view.exitView()); } } @Override public void onFailed(String message) { - view.showPopUpMessage(message,CustomAlertDialog.AlertType.FAILED,alertType->view.morphProgressBarIntoButton(null)); + if(!hasRequestedInternally) + view.showPopUpMessage(message,CustomAlertDialog.AlertType.FAILED,alertType->view.morphProgressBarIntoButton(null)); + else + view.showPopUpMessage(message,CustomAlertDialog.AlertType.FAILED,alertType->view.exitView()); } @Override protected void onConnectionNotEstablished(String message) { - view.showPopUpMessage(message,CustomAlertDialog.AlertType.NO_INTERNET,alertType->view.morphProgressBarIntoButton(null)); + if(!hasRequestedInternally) + view.showPopUpMessage(message,CustomAlertDialog.AlertType.NO_INTERNET,alertType->view.morphProgressBarIntoButton(null)); + else + view.showPopUpMessage(message,CustomAlertDialog.AlertType.NO_INTERNET,alertType->view.exitView()); } } } +