From 870739e897a8d4120fae2417c8ad1ddc6f1d774f Mon Sep 17 00:00:00 2001 From: yeeunyuk Date: Tue, 22 Nov 2022 01:37:03 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=9A=94=EC=B2=AD=EA=B0=92=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myapplication/ui/join/PasswordChangeActivity.java | 8 ++++++-- .../myapplication/ui/join/PasswordChangeRequest.java | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/application/app/src/main/java/com/mnchatbot/myapplication/ui/join/PasswordChangeActivity.java b/application/app/src/main/java/com/mnchatbot/myapplication/ui/join/PasswordChangeActivity.java index 930334a..5e20378 100644 --- a/application/app/src/main/java/com/mnchatbot/myapplication/ui/join/PasswordChangeActivity.java +++ b/application/app/src/main/java/com/mnchatbot/myapplication/ui/join/PasswordChangeActivity.java @@ -98,7 +98,7 @@ public void onClick(View view) { joinUserState.setPassword(passwordEditText.getText().toString()); joinUserState.setRePassword(passwordEditTextCheck.getText().toString()); if (joinUserState.isValidData() && isEmailValidated) { - changePw(new PasswordChangeRequest(joinUserState.getPassword())); + changePw(new PasswordChangeRequest(joinUserState.getEmail(), joinUserState.getPassword())); } else { Toast.makeText(getApplicationContext(), "다시 입력해주세요", Toast.LENGTH_LONG).show(); } @@ -188,9 +188,13 @@ public void onResponse(Call call, Response response) AlertDialog.Builder builder = new AlertDialog.Builder(PasswordChangeActivity.this); Intent intent = new Intent(getApplicationContext(), LoginActivity.class); startActivity(intent); + } else if(response.code() == 400) { + Log.d("패스워드변경", String.valueOf(response.code())); + String faileResult = "존재하지 않은 아이디 입니다. 다시 시도해주세요."; + Toast.makeText(PasswordChangeActivity.this, faileResult, Toast.LENGTH_SHORT).show(); } else { Log.d("패스워드변경", String.valueOf(response.code())); - String faileResult = "비밀번호 변경에 실패하였습니다. 다시 시도해주세요."; + String faileResult = "패스워드 변경 실패했습니다. 다시 시도해주세요."; Toast.makeText(PasswordChangeActivity.this, faileResult, Toast.LENGTH_SHORT).show(); } } diff --git a/application/app/src/main/java/com/mnchatbot/myapplication/ui/join/PasswordChangeRequest.java b/application/app/src/main/java/com/mnchatbot/myapplication/ui/join/PasswordChangeRequest.java index 185df76..044545d 100644 --- a/application/app/src/main/java/com/mnchatbot/myapplication/ui/join/PasswordChangeRequest.java +++ b/application/app/src/main/java/com/mnchatbot/myapplication/ui/join/PasswordChangeRequest.java @@ -4,10 +4,13 @@ //비밀번호 변경 요청 public class PasswordChangeRequest { + @SerializedName("memberEmail") + public String inputID; + @SerializedName("memberNewPassword") public String inputPw; - public PasswordChangeRequest(String inputPw) { - this.inputPw = inputPw; + public PasswordChangeRequest(String inputID, String inputPw) { + this.inputID = inputID; this.inputPw = inputPw; } }