|
|
@@ -50,7 +50,6 @@ import kr.co.zumo.app.lifeplus.view.ToastProvider;
|
|
|
import kr.co.zumo.app.lifeplus.view.animation.Barrier;
|
|
|
import kr.co.zumo.app.lifeplus.view.animation.LoadingDriver;
|
|
|
import kr.co.zumo.app.lifeplus.view.command.Command;
|
|
|
-import kr.co.zumo.app.lifeplus.view.command.EmailSendingCommand;
|
|
|
import kr.co.zumo.app.lifeplus.view.command.ExitCommand;
|
|
|
import kr.co.zumo.app.lifeplus.view.command.FinishActivityCommand;
|
|
|
import kr.co.zumo.app.lifeplus.view.command.ScreenCommand;
|
|
|
@@ -442,11 +441,9 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
|
|
|
break;
|
|
|
case ScreenID.SETTING_MEMBER_INFO:
|
|
|
if (model.isActiveMember()) {
|
|
|
- confirmPin(() -> {
|
|
|
- utilityActivityBean.setScreenId(ScreenID.SETTING_MEMBER_INFO);
|
|
|
- model.setDeliveryPackaging(utilityActivityBean);
|
|
|
- go(ScreenID.UTILITY_ACTIVITY);
|
|
|
- });
|
|
|
+ utilityActivityBean.setScreenId(ScreenID.SETTING_MEMBER_INFO);
|
|
|
+ model.setDeliveryPackaging(utilityActivityBean);
|
|
|
+ go(ScreenID.UTILITY_ACTIVITY);
|
|
|
}
|
|
|
else {
|
|
|
showPopupForGuest();
|
|
|
@@ -476,31 +473,6 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
|
|
|
return isSuccess;
|
|
|
}
|
|
|
|
|
|
- /***********************************
|
|
|
- * Pin Confirm
|
|
|
- ***********************************/
|
|
|
-
|
|
|
- protected void confirmPin(Runnable doAfterConfirm) {
|
|
|
- confirmPin(doAfterConfirm, () -> {}, () -> {}, true);
|
|
|
- }
|
|
|
-
|
|
|
- protected void confirmPinWithoutReset(Runnable doAfterConfirm) {
|
|
|
- confirmPin(doAfterConfirm, () -> {}, () -> {}, false);
|
|
|
- }
|
|
|
-
|
|
|
- protected void confirmPin(Runnable doAfterConfirm, Runnable doAfterFail, Runnable doAfterCancel, boolean hasResetButton) {
|
|
|
- // PinConfirmDialog
|
|
|
- pinDialog = DialogProvider.of(getFragmentManager()).showPinConfirm(
|
|
|
- model,
|
|
|
- doAfterConfirm,
|
|
|
- doAfterFail,
|
|
|
- doAfterCancel,
|
|
|
- () -> go(ScreenID.PIN_RESET_AUTH),
|
|
|
- () -> onCommand(new EmailSendingCommand(ResourceUtil.getString(R.string.lifeplus_email))),
|
|
|
- hasResetButton);
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
/***********************************
|
|
|
* Popup for guest
|
|
|
***********************************/
|