[공통][Bug] Confirm Dialog 정리

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/auth/MobileAuthPresenter.java

@@ -371,7 +371,7 @@ public class MobileAuthPresenter implements IMobileAuthContract.Presenter {
     // 3 회 "phone_identify_number_fail_2"
     if (++confirmRetryCount > 2) {
       // 3회
-      showFailPopup(R.string.phone_identify_number_fail_2, new IDialogResultListener() {
+      showConfirmDialog(R.string.phone_identify_number_fail_2, new IDialogResultListener() {
         @Override
         public void onDialogResult(DialogBase dialog, Event event) {
           if (event.getEventId() == Event.CONFIRM) {
@@ -388,7 +388,7 @@ public class MobileAuthPresenter implements IMobileAuthContract.Presenter {
     }
     else {
       // 1, 2 회
-      showFailPopup(R.string.phone_identify_number_fail_1, new IDialogResultListener() {
+      showConfirmDialog(R.string.phone_identify_number_fail_1, new IDialogResultListener() {
         @Override
         public void onDialogResult(DialogBase dialog, Event event) {
           if (event.getEventId() == Event.CONFIRM) {
@@ -423,7 +423,7 @@ public class MobileAuthPresenter implements IMobileAuthContract.Presenter {
     confirmRetryCount = 0;
   }
 
-  private void showFailPopup(@StringRes int stringId, IDialogResultListener listener) {
+  private void showConfirmDialog(@StringRes int stringId, IDialogResultListener listener) {
     dialog = DialogBuilder.create(DialogID.CONFIRM)
       .listener(listener)
       .attribute((IAttribute<ConfirmDialog>) dialog -> {
@@ -533,7 +533,18 @@ public class MobileAuthPresenter implements IMobileAuthContract.Presenter {
     verifyRequestNumberButton(true);
     view.setEnabledRequestConfirmTextView(false);
     view.setEnabledRequestConfirmButton(false);
-    showSendingPopup(R.string.phone_identify_submit_message_fail);
+    showConfirmDialog(R.string.phone_identify_submit_message_fail, new IDialogResultListener() {
+      @Override
+      public void onDialogResult(DialogBase dialog, Event event) {
+        if (event.getEventId() == Event.CONFIRM) {
+          dialog.dispose();
+        }
+      }
+
+      @Override
+      public void onDialogCanceled(DialogBase dialog) {
+      }
+    });
   }
 
   private void doSomeWhenSendingSuccess() {
@@ -601,26 +612,6 @@ public class MobileAuthPresenter implements IMobileAuthContract.Presenter {
     }
   }
 
-  private void showSendingPopup(@StringRes int stringId) {
-    dialog = DialogBuilder.create(DialogID.CONFIRM)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-        }
-      })
-      .attribute((IAttribute<ConfirmDialog>) dialog -> {
-        dialog.setText(ResourceUtil.getString(stringId));
-      })
-      .show();
-  }
-
   private boolean isAvailableRequestNumberButtonToDisable = true;
 
   private void countRetryButton() {

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/IDialogResultListener.java

@@ -16,6 +16,18 @@ import kr.co.zumo.app.lifeplus.view.Event;
  * @since 2018. 9. 14.
  */
 public interface IDialogResultListener {
+  /**
+   * 특정 결과가 있을 경우 실행
+   *
+   * @param dialog
+   * @param event
+   */
   void onDialogResult(DialogBase dialog, Event event);
+
+  /**
+   * 취소/back key 등 처리 없이 닫는 경우
+   *
+   * @param dialog
+   */
   void onDialogCanceled(DialogBase dialog);
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/Presenter.java

@@ -19,6 +19,12 @@ import kr.co.zumo.app.lifeplus.view.IView;
 import kr.co.zumo.app.lifeplus.view.command.Command;
 import kr.co.zumo.app.lifeplus.view.command.FragmentBackStackChangeCommand;
 import kr.co.zumo.app.lifeplus.view.command.HomeCommand;
+import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
+import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
+import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
+import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
+import kr.co.zumo.app.lifeplus.view.dialog.IDialogResultListener;
+import kr.co.zumo.app.lifeplus.view.dialog.TextDialog;
 
 /**
  * Presenter
@@ -35,6 +41,7 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
   protected M model;
   protected V view;
   protected Command command;
+  protected DialogBase dialog;
 
   public Presenter(M model, V view) {
     Log.i("APP# Presenter | constructor", "|" + "------------------------->> " + this.getClass().getSimpleName());
@@ -77,6 +84,11 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
   public final void destroy() {
     Log.i("APP# Presenter | destroy", "|" + "<<------------------------- " + this.getClass().getSimpleName());
 
+    if(null != dialog) {
+      dialog.dispose();
+      dialog = null;
+    }
+
     destroyInternal();
   }
 
@@ -127,6 +139,38 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
     command.postExecute(model, view, this);
   }
 
+  protected void showErrorDialog(String string) {
+    showErrorDialog(string, null);
+  }
+
+  protected void showErrorDialog(String string, Runnable runnable) {
+    dialog = DialogBuilder.create(DialogID.CONFIRM)
+      .listener(new IDialogResultListener() {
+        @Override
+        public void onDialogResult(DialogBase dialog, Event event) {
+          if (event.getEventId() == Event.CONFIRM) {
+            dialog.dispose();
+          }
+
+          if (null != runnable) {
+            runnable.run();
+          }
+        }
+
+        @Override
+        public void onDialogCanceled(DialogBase dialog) {
+          dialog.dispose();
+
+          if (null != runnable) {
+            runnable.run();
+          }
+        }
+      })
+      .attribute((IAttribute<TextDialog>) dialog -> {
+        dialog.setText(string);
+      })
+      .show();
+  }
   /***********************************
    * listener
    ***********************************/

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/faq/FAQPresenter.java

@@ -8,12 +8,6 @@ import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.command.FragmentBackStackChangeCommand;
-import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
-import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
-import kr.co.zumo.app.lifeplus.view.dialog.IDialogResultListener;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
@@ -28,7 +22,6 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  */
 public class FAQPresenter extends Presenter<FAQModel, IFAQView> {
 
-  DialogBase alertDialog;
   private DoubleChecker doubleChecker;
 
   public FAQPresenter(FAQModel model, IFAQView view) {
@@ -61,11 +54,6 @@ public class FAQPresenter extends Presenter<FAQModel, IFAQView> {
 
   @Override
   protected void destroyInternal() {
-    if (null != alertDialog) {
-      alertDialog.dispose();
-      alertDialog = null;
-    }
-
     if(null != doubleChecker) {
       doubleChecker.dispose();
       doubleChecker = null;
@@ -96,7 +84,7 @@ public class FAQPresenter extends Presenter<FAQModel, IFAQView> {
   public void onResult(Event event) {
     switch (event.getEventId()) {
       case Event.ERROR:
-        showAlert(event.getString());
+        showErrorDialog(event.getString());
         break;
       case Event.RESULT:
         doubleChecker.checkSecond();
@@ -110,26 +98,4 @@ public class FAQPresenter extends Presenter<FAQModel, IFAQView> {
     view.drawList(model.getFaqBeans());
   }
 
-  private void showAlert(String str) {
-    alertDialog = DialogBuilder.create(DialogID.CONFIRM)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            alertDialog = null;
-            dialog.dispose();
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-          alertDialog = null;
-        }
-      })
-      .attribute((IAttribute<ConfirmDialog>) dialog -> {
-        dialog.setText(str);
-      })
-      .show();
-  }
-
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainPresenter.java

@@ -8,12 +8,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.command.ExitCommand;
 import kr.co.zumo.app.lifeplus.view.command.FragmentBackStackChangeCommand;
-import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
-import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
-import kr.co.zumo.app.lifeplus.view.dialog.IDialogResultListener;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 import kr.co.zumo.app.lifeplus.view.screen.factory.BasicFragmentFactory;
 import kr.co.zumo.app.lifeplus.view.screen.factory.SignUpZumoFragmentFactory;
@@ -87,12 +82,12 @@ public class MainPresenter extends Presenter<MainModel, IMainView> {
     switch (event.getEventId()) {
       case Event.COMPLETED:
         if (event.getInteger() == Event.MEMBER_DELETE) {
-          showAlert("탈퇴 완료");
+          showErrorDialog("탈퇴 완료");
         }
         break;
       case Event.ERROR:
         if (event.getInteger() == Event.MEMBER_DELETE) {
-          showAlert("탈퇴 에러 발생 - " + event.getString());
+          showErrorDialog("탈퇴 에러 발생 - " + event.getString());
         }
         break;
       default:
@@ -142,25 +137,4 @@ public class MainPresenter extends Presenter<MainModel, IMainView> {
     }
   }
 
-  private void showAlert(String str) {
-
-    alertDialog = DialogBuilder.create(DialogID.CONFIRM)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-        }
-      })
-      .attribute((IAttribute<ConfirmDialog>) dialog -> {
-        dialog.setText(str);
-      })
-      .show();
-  }
-
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/member/MemberRestStartPresenter.java

@@ -11,12 +11,6 @@ import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IView;
 import kr.co.zumo.app.lifeplus.view.command.EmailSendingCommand;
 import kr.co.zumo.app.lifeplus.view.command.FragmentBackStackChangeCommand;
-import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
-import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
-import kr.co.zumo.app.lifeplus.view.dialog.IDialogResultListener;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
@@ -31,8 +25,6 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  */
 public class MemberRestStartPresenter extends Presenter<RestMemberModel, IView> {
 
-  DialogBase alertDialog;
-
   public MemberRestStartPresenter(RestMemberModel model, IView view) {
     super(model, view);
   }
@@ -45,10 +37,6 @@ public class MemberRestStartPresenter extends Presenter<RestMemberModel, IView>
 
   @Override
   protected void destroyInternal() {
-    if (null != alertDialog) {
-      alertDialog.dispose();
-      alertDialog = null;
-    }
   }
 
   @Override
@@ -97,32 +85,11 @@ public class MemberRestStartPresenter extends Presenter<RestMemberModel, IView>
         onCommand(new FragmentBackStackChangeCommand(ScreenID.REST_MEMBER_ACTIVE_COMPLETED, ScreenID.DIRECTION_NEXT));
         break;
       case Event.ERROR:
-        showErrorPopup(event.getString());
+        showErrorDialog(event.getString());
         break;
       default:
         break;
     }
   }
 
-  private void showErrorPopup(String errorMessage) {
-    alertDialog = DialogBuilder.create(DialogID.CONFIRM)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-          dialog.dispose();
-        }
-      })
-      .attribute((IAttribute<ConfirmDialog>) dialog -> {
-        dialog.setText(errorMessage);
-      })
-      .show();
-  }
-
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/SettingPresenter.java

@@ -21,12 +21,6 @@ import kr.co.zumo.app.lifeplus.view.command.AppUpdateCommand;
 import kr.co.zumo.app.lifeplus.view.command.FragmentBackStackChangeCommand;
 import kr.co.zumo.app.lifeplus.view.command.NotificationSettingCommand;
 import kr.co.zumo.app.lifeplus.view.command.TextShareCommand;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
-import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
-import kr.co.zumo.app.lifeplus.view.dialog.IDialogResultListener;
-import kr.co.zumo.app.lifeplus.view.dialog.TextDialog;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
@@ -214,38 +208,13 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
         }
         break;
       case Event.ERROR:
-        showErrorDialog(event.getString());
+        showErrorDialog(event.getString(), () -> onBackPressed());
         break;
       default:
         break;
     }
   }
 
-  private void showErrorDialog(String string) {
-    DialogBuilder.create(DialogID.CONFIRM)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-
-            onBackPressed();
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-          dialog.dispose();
-
-          onBackPressed();
-        }
-      })
-      .attribute((IAttribute<TextDialog>) dialog -> {
-        dialog.setText(string);
-      })
-      .show();
-  }
-
   private void render() {
     SettingBean settingBean = model.getSettingBean();
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/code/SettingCodePresenter.java

@@ -11,12 +11,6 @@ import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.command.FragmentBackStackChangeCommand;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
-import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
-import kr.co.zumo.app.lifeplus.view.dialog.IDialogResultListener;
-import kr.co.zumo.app.lifeplus.view.dialog.TextDialog;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
@@ -94,38 +88,13 @@ public class SettingCodePresenter extends Presenter<SettingCodeModel, ISettingCo
         }
         break;
       case Event.ERROR:
-        showErrorDialog(event.getString());
+        showErrorDialog(event.getString(), () -> onBackPressed());
         break;
       default:
         break;
     }
   }
 
-  private void showErrorDialog(String string) {
-    DialogBuilder.create(DialogID.CONFIRM)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-
-            onBackPressed();
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-          dialog.dispose();
-
-          onBackPressed();
-        }
-      })
-      .attribute((IAttribute<TextDialog>) dialog -> {
-        dialog.setText(string);
-      })
-      .show();
-  }
-
   private void onInvalidCode(int resultIndex) {
     if (resultIndex == Event.CODE_INVALID_SPECIAL_CODE) {
       view.setValidationSpecialCode(ResourceUtil.getString(R.string.special_code_error));

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/common/SettingMemberInfoPresenter.java

@@ -19,7 +19,6 @@ import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
 import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
 import kr.co.zumo.app.lifeplus.view.dialog.IDialogResultListener;
-import kr.co.zumo.app.lifeplus.view.dialog.TextDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.WebDialog;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
@@ -96,7 +95,7 @@ public class SettingMemberInfoPresenter extends Presenter<SettingMemberInfoModel
           // 이메일 등록 에러
           onEmailRegistrationError();
         }
-        showErrorDialog(event.getString());
+        showErrorDialog(event.getString(), null);
         break;
       default:
         break;
@@ -143,28 +142,6 @@ public class SettingMemberInfoPresenter extends Presenter<SettingMemberInfoModel
     }
   }
 
-
-  private void showErrorDialog(String string) {
-    DialogBuilder.create(DialogID.CONFIRM)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-          dialog.dispose();
-        }
-      })
-      .attribute((IAttribute<TextDialog>) dialog -> {
-        dialog.setText(string);
-      })
-      .show();
-  }
-
   /***********************************
    * public
    ***********************************/
@@ -328,5 +305,6 @@ public class SettingMemberInfoPresenter extends Presenter<SettingMemberInfoModel
    */
   public void onClickMemberOut() {
     // 회원 탈퇴 화면 이동
+    onCommand(new FragmentBackStackChangeCommand(ScreenID.SETTING_MEMBER_QUIT_INFO, ScreenID.DIRECTION_NEXT));
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpAgreePresenter.java

@@ -15,7 +15,6 @@ import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.command.FragmentChangeCommand;
-import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.CustomAlertDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
@@ -39,7 +38,6 @@ public class SignUpAgreePresenter extends Presenter<SignUpAgreeModel, ISignUpAgr
 
   protected boolean isValidated = false;
   protected boolean isSaved = false;
-  DialogBase alertDialog;
   Disposable disposable;
   private DoubleChecker doubleChecker;
 
@@ -75,11 +73,6 @@ public class SignUpAgreePresenter extends Presenter<SignUpAgreeModel, ISignUpAgr
   protected void destroyInternal() {
     model.stopPolicyRequest();
 
-    if (null != alertDialog) {
-      alertDialog.dispose();
-      alertDialog = null;
-    }
-
     if (null != disposable) {
       disposable.dispose();
       disposable = null;
@@ -117,16 +110,16 @@ public class SignUpAgreePresenter extends Presenter<SignUpAgreeModel, ISignUpAgr
         break;
       case Event.ERROR:
         if (event.getInteger() == Event.POLICY_REQUEST) {
-          showErrorPopup(event.getString());
+          showErrorDialog(event.getString());
         }
         else if (event.getInteger() == Event.POLICY_CONFIRM) {
-          showErrorPopup(event.getString());
+          showErrorDialog(event.getString());
         }
         else if (event.getInteger() == Event.MEMBER_JOIN) {
-          showErrorPopup(event.getString());
+          showErrorDialog(event.getString());
         }
         else if (event.getInteger() == Event.MEMBER_LOGIN) {
-          showErrorPopup(event.getString());
+          showErrorDialog(event.getString());
         }
         break;
       default:
@@ -147,7 +140,7 @@ public class SignUpAgreePresenter extends Presenter<SignUpAgreeModel, ISignUpAgr
       onCommand(new FragmentChangeCommand(ScreenID.REST_MEMBER_START, ScreenID.DIRECTION_NEXT));
     }
     else if (SuperModel.getInstance().isOutMember()) {
-      showErrorPopup("탈퇴한 회원입니다.");
+      showErrorDialog("탈퇴한 회원입니다.");
     }
     else {
       // 정상
@@ -155,28 +148,6 @@ public class SignUpAgreePresenter extends Presenter<SignUpAgreeModel, ISignUpAgr
     }
   }
 
-  private void showErrorPopup(String errorMessage) {
-
-    alertDialog = DialogBuilder.create(DialogID.CONFIRM)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-          dialog.dispose();
-        }
-      })
-      .attribute((IAttribute<ConfirmDialog>) dialog -> {
-        dialog.setText(errorMessage);
-      })
-      .show();
-  }
-
   private void renderAfterReady() {
     view.init(getAgreeItems());
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpMobileAuthPresenter.java

@@ -23,7 +23,6 @@ import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.command.FragmentChangeCommand;
-import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.CustomAlertDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
@@ -115,7 +114,7 @@ public class SignUpMobileAuthPresenter extends Presenter<SignUpAuthModel, ISignU
       case Event.ERROR:
         // error
         if (event.getInteger() == Event.MEMBER_AUTH) {
-          showPopup();
+          showErrorDialog(ResourceUtil.getString(R.string.undefined_error));
         }
         break;
       default:
@@ -161,27 +160,6 @@ public class SignUpMobileAuthPresenter extends Presenter<SignUpAuthModel, ISignU
     }
   }
 
-  private void showPopup() {
-    dialog = DialogBuilder.create(DialogID.CONFIRM)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-        }
-      })
-      .attribute((IAttribute<ConfirmDialog>) dialog -> {
-        dialog.setText(ResourceUtil.getString(R.string.undefined_error));
-      })
-      .show();
-  }
-
-
   private void onAuthResult() {
     MobileAuthBean mobileAuthBean = model.getMobileAuthorizationBean();