Forráskód Böngészése

[회원가입][New] 가입 완료 > 이미 회원 루틴 처리 2
- 바로 전 입력된 핀으로 잠금해제 못하도록 수정

hyodong.min 7 éve
szülő
commit
0a58a21caa

+ 11 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/model/SuperModel.java

@@ -282,20 +282,27 @@ public final class SuperModel {
   }
 
   /**
-   * 핀 저장
+   * 핀 저장 - 핀을 암호화 처리해줌
    *
-   * @param pin
+   * @param pin 암호화 할 핀
    */
   public void savePinWithEncryption(String pin) {
     try {
       String encryptedPin = StringUtil.convertToSHA256(StringUtil.convertToMD5(pin));
-//      Log.i("APP# SuperModel | savePinWithEncryption", "| pin: " + pin + ", encryptedPin: " + encryptedPin);
-      getPreferences().setEncryptedPin(encryptedPin);
+      saveEncryptedPin(encryptedPin);
     } catch (Exception e) {
       e.printStackTrace();
     }
   }
 
+  /**
+   * 핀 저장 - 암호환 된 핀을
+   * @param encryptedPin 암호화된 핀
+   */
+  public void saveEncryptedPin(String encryptedPin) {
+    getPreferences().setEncryptedPin(encryptedPin);
+  }
+
   /**
    * Screen Width
    *

+ 2 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpAgreeModel.java

@@ -163,7 +163,7 @@ public class SignUpAgreeModel extends Model {
       // 인증 안했음;
       Log.e("APP#  SignUpModel | signUp", "|" + "인증 안했음");
     }
-    else if (false == getPreferences().getEncryptedPin().equals(SignUpModelHelper.getInstance().getEncryptedPin())) {
+    else if (StringUtil.isEmpty(SignUpModelHelper.getInstance().getEncryptedPin())) {
       // 핀 입력 안했음
       Log.e("APP#  SignUpModel | signUp", "|" + "핀 입력 안했음");
     }
@@ -198,6 +198,7 @@ public class SignUpAgreeModel extends Model {
           @Override
           public void onApiSuccess(MemberJoinResultBean resultBean) {
             saveUserId(resultBean.getData().getUserNo());
+            SuperModel.getInstance().saveEncryptedPin(SignUpModelHelper.getInstance().getEncryptedPin());
             onResult(new Event.Builder(Event.RESULT).integer(Event.MEMBER_JOIN).build());
           }
 

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpAlreadyMemberPresenter.java

@@ -125,7 +125,7 @@ public class SignUpAlreadyMemberPresenter extends Presenter<SignUpAlreadyMemberM
             case Event.FAIL:
               dialog.dispose();
               // 핀 불일치
-              showErrorDialog(R.string.pin_miss_match_error);
+//              showErrorDialog(R.string.pin_miss_match_error);
               break;
             case Event.HELP:
               // 이메일 문의

+ 12 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpPinModel.java

@@ -3,8 +3,10 @@
  */
 package kr.co.zumo.app.lifeplus.view.screen.signup;
 
+import java.security.NoSuchAlgorithmException;
+
 import kr.co.zumo.app.lifeplus.model.Model;
-import kr.co.zumo.app.lifeplus.model.SuperModel;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 
 /**
  * SignUpPinModel
@@ -56,8 +58,15 @@ public class SignUpPinModel extends Model {
    * @param pin
    */
   public void savePin(String pin) {
-    SuperModel.getInstance().savePinWithEncryption(pin);
-    SignUpModelHelper.getInstance().setEncryptedPin(getPreferences().getEncryptedPin());
+//    SuperModel.getInstance().savePinWithEncryption(pin);
+//    SignUpModelHelper.getInstance().setEncryptedPin(getPreferences().getEncryptedPin());
+    String encryptedPin = null;
+    try {
+      encryptedPin = StringUtil.convertToSHA256(StringUtil.convertToMD5(pin));
+    } catch (NoSuchAlgorithmException e) {
+      e.printStackTrace();
+    }
+    SignUpModelHelper.getInstance().setEncryptedPin(encryptedPin);
   }
 
   public int getBackwardWarnStringId() {