From ac993ac28b143e3ec6fa19cb69b5421ef0771f25 Mon Sep 17 00:00:00 2001
From: yeeunyuk <yy.eun6@gmail.com>
Date: Sat, 14 Jan 2023 22:22:35 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8,=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=ED=95=98?=
 =?UTF-8?q?=EB=A9=B4=20=EC=A0=80=EC=9E=A5=EB=90=9C=20=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=EB=94=94=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myapplication/ui/login/LoginActivity.java | 49 ++++++++++---------
 .../ui/setting/ProfileActivity.java           |  8 ++-
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java b/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java
index 3f22ce9..b0f26ba 100644
--- a/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java
+++ b/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java
@@ -123,26 +123,6 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
             }
         });
 
-        login_button = findViewById( R.id.login );
-
-        login_button.setOnClickListener( new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this);
-                builder.setTitle("알림")
-                        .setMessage("서버를 옮기는 중입니다! 지금은 서비스를 이용하실 수 없습니다.🥺")
-                        .setPositiveButton("확인", null)
-                        .create()
-                        .show();
-                //LoginResponse();
-                if (ID != null) {
-                    Intent intent = new Intent(LoginActivity.this, PetSelectActivity.class);
-                    startActivity(intent);
-                    LoginActivity.this.finish();
-                }
-            }
-        });
-
         //(TEST) 자동 로그인 체크됨에 따라 저장하기
         autoLogin.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -156,6 +136,31 @@ public void onClick(View view) {
             }
         });
 
+        if (ID == null) {
+            Login();
+        } else {
+            Toast.makeText(this, "자동 로그인", Toast.LENGTH_SHORT).show();
+            Intent intent = new Intent(LoginActivity.this, PetSelectActivity.class);
+            startActivity(intent);
+            LoginActivity.this.finish();
+        }
+
+    }
+
+    public void Login() {
+        login_button = findViewById( R.id.login );
+        login_button.setOnClickListener( new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this);
+                builder.setTitle("알림")
+                        .setMessage("서버를 옮기는 중입니다! 지금은 서비스를 이용하실 수 없습니다.🥺")
+                        .setPositiveButton("확인", null)
+                        .create()
+                        .show();
+                LoginResponse();
+            }
+        });
     }
 
     public void LoginResponse() {
@@ -181,10 +186,6 @@ public void onResponse(Call<LoginResponse> call, Response<LoginResponse> respons
                 editor.commit();
                 Log.d("Token", token);
 
-                //자동 로그인 체크됨에 따라 저장하기
-                if(autoLogin.isChecked()) {
-                }
-
                 if (statusCode==200) {
                     String userID = login_email.getText().toString();
 
diff --git a/application/app/src/main/java/com/mnchatbot/myapplication/ui/setting/ProfileActivity.java b/application/app/src/main/java/com/mnchatbot/myapplication/ui/setting/ProfileActivity.java
index 50a5a8f..331173b 100644
--- a/application/app/src/main/java/com/mnchatbot/myapplication/ui/setting/ProfileActivity.java
+++ b/application/app/src/main/java/com/mnchatbot/myapplication/ui/setting/ProfileActivity.java
@@ -3,6 +3,7 @@
 
 package com.mnchatbot.myapplication.ui.setting;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -26,7 +27,7 @@
 public class ProfileActivity extends SettingActivity {
     private Context context;
     private TextView ID, pwchange, logout, deleteinfo;
-    private SharedPreferences preferences;
+    private SharedPreferences preferences, pre2;
 
     //서버통신
     public String getToken() {
@@ -63,6 +64,11 @@ public void onClick(View view) {
             @Override
             public void onClick(View view) {
                 //로그인 화면으로 돌아가기
+                pre2 = context.getSharedPreferences("autoLogin", Activity.MODE_PRIVATE);
+                SharedPreferences.Editor editor = pre2.edit();
+                editor.clear();
+                editor.commit();
+
                 Intent intent = new Intent(getApplicationContext(), LoginActivity.class);
                 startActivity(intent);
             }