[공통][New] 로그인 구현 준비

app/src/main/java/kr/co/zumo/app/lifeplus/activity/ActivityStarter.java

@@ -11,13 +11,6 @@ import kr.co.zumo.app.lifeplus.model.LifeplusPreferences;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
-import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.dialog.AlertDialog;
-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;
 
 /**
  * ActivityStarter
@@ -39,6 +32,9 @@ public class ActivityStarter {
   public void launch(boolean isConnected) {
     Log.i("APP# SplashActivity | onCreate", "| Network Connected ==============================================================> " + isConnected);
     LifeplusPreferences preferences = SuperModel.getInstance().getPreferences();
+
+    setDeviceId(AppUtil.getDeviceId(context));
+
     Intent intent;
     intent = new Intent(context, MainActivity.class);
     if (isConnected == false) {
@@ -50,69 +46,29 @@ public class ActivityStarter {
     else if (preferences.isTutorialDone() == false) {
       intent = new Intent(context, TutorialActivity.class);
     }
-//    else if (StringUtil.isFull(SuperModel.getInstance().getUserId()) == false) {
-//      intent = new Intent(context, SignUpActivity.class);
-//    }
-
-    try {
-      verifyUuid();
-    } catch (Throwable e) {
-      e.printStackTrace();
-      // uuid 가 변경됨, 다시 인증 필요
+    else if (StringUtil.isFull(SuperModel.getInstance().getUserId())) {
       intent = null;
-      showUuidDialog();
-    } finally {
-      if (null != intent) {
-        context.startActivity(intent);
-      }
-    }
-  }
 
-  private void showUuidDialog() {
-    DialogBuilder.create(DialogID.ALERT)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-          Intent intent = new Intent(context, SignUpActivity.class);
-          context.startActivity(intent);
-        }
+      /**
+       * 로그인
+       * 로그인 완료되면
+       * -> 정상 : token 저장
+       * -> 비정상
+       *   - 블럭 계정
+       *   - 휴면 계정
+       *   - 일시 중지
+       *
+       */
 
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-          Intent intent = new Intent(context, SignUpActivity.class);
-          context.startActivity(intent);
-        }
-      })
-      .attribute((IAttribute<AlertDialog>) dialog -> {
-        dialog.setText("UUID 가 변경되어 본인 인증이 필요합니다.");
-      })
-      .show();
-  }
-
-  private void verifyUuid() {
-    String uuid = SuperModel.getInstance().getPreferences().getDeviceUuid();
-    String currentUuid = AppUtil.getDeviceUuid(context);
-
-    if (StringUtil.isFull(uuid)) {
-      // 현재 장치 값과 저장된 값이 같은지 검증;
-      if (uuid.equals(currentUuid)) {
-        // 이상 없음
-        Log.w("APP# SplashActivity | verifyUuid", "|" + "이상 없음");
-      }
-      else {
-        Log.e("APP#  SplashActivity | verifyUuid", "| " + "uuid 가 변경됨");
-        throw new RuntimeException("uuid changed.");
-      }
     }
-    else {
-      // 저장돼있지 않으면 처음이므로 저장;
-      Log.w("APP# SplashActivity | verifyUuid", "|" + "저장돼있지 않으면 처음이므로 저장");
-      setDeviceUuid(currentUuid);
+
+    if (null != intent) {
+      context.startActivity(intent);
     }
   }
 
-  private void setDeviceUuid(String uuid) {
-    Log.w("APP# SplashActivity | setDeviceUuid", "| " + uuid);
-    SuperModel.getInstance().setDeviceUuid(uuid);
+  private void setDeviceId(String deviceId) {
+    Log.w("APP# SplashActivity | setDeviceId", "| " + deviceId);
+    SuperModel.getInstance().setDeviceId(deviceId);
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/activity/MainActivity.java

@@ -44,7 +44,7 @@ public class MainActivity extends ActivityBase<MainPresenter> implements IMainVi
       SuperModel.getInstance().getPreferences().setPermissionInfoDone(false);
       SuperModel.getInstance().getPreferences().setTutorialDone(false);
       SuperModel.getInstance().setUserId("");
-      SuperModel.getInstance().setDeviceUuid("");
+      SuperModel.getInstance().setDeviceId("");
       SuperModel.getInstance().getPreferences().setEncryptedPin("");
       SuperModel.getInstance().getPreferences().setZumoUserUpdateCompleted(false);
       SuperModel.getInstance().getPreferences().setEncryptionUserNo("");

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

@@ -61,11 +61,11 @@ public final class SuperModel {
   /**
    * 장치 고유번호 저장;
    *
-   * @param deviceUuid
+   * @param deviceId
    */
-  public void setDeviceUuid(String deviceUuid) {
-    this.deviceUuid = deviceUuid;
-    preferences.setDeviceUuid(deviceUuid);
+  public void setDeviceId(String deviceId) {
+    this.deviceUuid = deviceId;
+    preferences.setDeviceUuid(deviceId);
   }
 
   /**

app/src/main/java/kr/co/zumo/app/lifeplus/util/AppUtil.java

@@ -46,7 +46,7 @@ public class AppUtil {
    * @return
    */
   @SuppressLint("HardwareIds")
-  public static String getDeviceUuid(Context context) {
+  public static String getDeviceId(Context context) {
     return Secure.getString(context.getContentResolver(), Secure.ANDROID_ID);
   }