[설정][New] 간편암호 제거 : 모듈/로직

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

@@ -119,7 +119,6 @@ public class MainFragment extends MainDebugFragment implements IMainView {
       button = findViewById(R.id.button_0000);
       button.setOnClickListener(v -> {
         new LoadingDriver().create(getActivity(), 5000);
-        setDefaultPin();
         renderDebug();
       });
 
@@ -204,14 +203,6 @@ public class MainFragment extends MainDebugFragment implements IMainView {
     new APIGuestModule().call(new RequestBean(), new APIModuleSimpleListener<>());
   }
 
-  /**
-   * 0000 으로 핀 초기화 - 테스트 용 for test
-   */
-  @Deprecated
-  private void setDefaultPin() {
-    SuperModel.getInstance().savePinWithEncryption("0000");
-  }
-
   @Deprecated
   private void login() {
     new APIMemberSelectModule().call(new RequestBean(),
@@ -250,7 +241,6 @@ public class MainFragment extends MainDebugFragment implements IMainView {
       id = BuildConfig.DEV_USER_1;
     }
     SuperModel.getInstance().setUserId(StringUtil.isFull(id) ? id : "");
-    setDefaultPin(); // pin 0000
     login();
   }
 
@@ -269,7 +259,6 @@ public class MainFragment extends MainDebugFragment implements IMainView {
       id = BuildConfig.DEV_USER_2;
     }
     SuperModel.getInstance().setUserId(StringUtil.isFull(id) ? id : "");
-    setDefaultPin(); // pin 0000
     login();
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/model/LifeplusPreferences.java

@@ -151,6 +151,7 @@ public class LifeplusPreferences {
 
   /**
    * 암호화된 핀
+   * - MD5 -> SHA256
    *
    * @param pin 암호화 핀
    */

app/src/main/java/kr/co/zumo/app/lifeplus/model/Model.java

@@ -25,7 +25,6 @@ import kr.co.zumo.app.lifeplus.helper.IHelperProvider;
 import kr.co.zumo.app.lifeplus.helper.ScreenIDDeliveryHelper;
 import kr.co.zumo.app.lifeplus.model.module.APIError;
 import kr.co.zumo.app.lifeplus.model.module.APIModuleListener;
-import kr.co.zumo.app.lifeplus.model.module.PinModuleParser;
 import kr.co.zumo.app.lifeplus.network.INetworkReceiverListener;
 import kr.co.zumo.app.lifeplus.network.NetworkWatcher;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
@@ -302,16 +301,6 @@ public abstract class Model extends ViewModel implements ILifeCycle, IHelperProv
     getHelper(DeliveryResultHelper.class).clearPackaging();
   }
 
-  /**
-   * 입력한 핀과 저장된 핀이 같은지 확인
-   *
-   * @param pin "0000"
-   * @return boolean
-   */
-  public boolean verifyPin(String pin) {
-    return new PinModuleParser().verify(pin);
-  }
-
   /**
    * 버킷 리스트 수를 파악한다.
    *

app/src/main/java/kr/co/zumo/app/lifeplus/model/SuperModel.java

@@ -100,8 +100,6 @@ public final class SuperModel implements IMemberStatusManager {
     // 탈퇴 후 회원 데이터 제거
     clearMemberDataInternal();
 
-    getPreferences().setEncryptedPin("");
-
   }
 
   private void clearMemberDataInternal() {

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/PinModuleParser.java

@@ -1,43 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.model.module;
-
-import android.util.Log;
-
-import kr.co.zumo.app.lifeplus.model.SuperModel;
-import kr.co.zumo.app.lifeplus.util.StringUtil;
-
-/**
- * PinModuleParser
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018-10-10]   [최초 작성]
- * @since 2018-10-10
- */
-public class PinModuleParser {
-
-  /**
-   * 입력한 핀과 저장된 핀이 같은지 확인
-   *
-   * @param pin "0000"
-   * @return boolean
-   */
-  public boolean verify(String pin) {
-    String encryptedPin;
-    try {
-      encryptedPin = StringUtil.convertToSHA256(StringUtil.convertToMD5(pin));
-    } catch (Exception e) {
-      //e.printStackTrace();
-      Log.e("APP#  PinModuleParser | verify", "Log.getStackTraceString(e) |" + Log.getStackTraceString(e));
-      encryptedPin = "";
-    }
-    String savedPin = SuperModel.getInstance().getPreferences().getEncryptedPin();
-
-    return StringUtil.isFull(encryptedPin) && StringUtil.isFull(savedPin) && savedPin.equals(encryptedPin);
-  }
-
-}

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

@@ -7,7 +7,6 @@ import android.support.annotation.StringRes;
 import android.support.v4.app.FragmentManager;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.model.Model;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 
@@ -83,65 +82,6 @@ public class DialogProvider {
       .show();
   }
 
-  /**
-   * 핀 확인
-   *
-   * @param model
-   * @param confirm
-   * @param fail
-   * @param cancel
-   * @param reset
-   * @param help
-   * @param hasResetButton
-   * @return
-   */
-  public PinConfirmDialog showPinConfirm(Model model, Runnable confirm, Runnable fail, Runnable cancel, Runnable reset, Runnable help, boolean hasResetButton) {
-    // PinConfirmDialog
-    return new DialogBuilder<PinConfirmDialog, ICustomDialogListener>(manager, DialogID.PIN_CONFIRM)
-      .listener(new ICustomDialogListener<PinConfirmDialog>() {
-        @Override
-        public void onDialogResult(PinConfirmDialog dialog, Event event) {
-          switch (event.getEventId()) {
-            case Event.CONFIRM:
-              String inputPin = event.getString();
-              if (model.verifyPin(inputPin)) {
-                dialog.resetPinFailCount();
-                dialog.dispose();
-                confirm.run();
-              }
-              else {
-                dialog.retry();
-              }
-
-              break;
-            case Event.FAIL:
-              // 핀 불일치
-              fail.run();
-              break;
-            case Event.RESET:
-              dialog.dispose();
-              reset.run();
-              break;
-            case Event.HELP:
-              // 이메일 문의
-              help.run();
-              break;
-            default:
-              dialog.dispose();
-              break;
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(PinConfirmDialog dialog) {
-          dialog.dispose();
-          cancel.run();
-        }
-      })
-      .attribute(dialog -> dialog.setResetButtonVisible(hasResetButton))
-      .show();
-  }
-
   /**
    * 비회원 가입 유도
    *