diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java index 2270d30..ca7e9f1 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java @@ -5,6 +5,7 @@ public class LoginResponseJson { private Integer uid; private String token; + private String name; public LoginResponseJson() { } @@ -18,5 +19,10 @@ public String getToken() { return this.token; } + + public String getName() { + return this.name; + } + //----------------------------------------------------------------- } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java index 2af6024..61a6513 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java @@ -74,6 +74,7 @@ // ログイン成功時に値の変更を行う private void setVariableFromResponse(Acanthus acanthus, LoginResponseJson loginResponse, String email, String password) { acanthus.setPreferenceUid(loginResponse.getUid()); + acanthus.setPreferenceName(loginResponse.getName()); acanthus.setPreferenceToken(loginResponse.getToken()); acanthus.setPreferenceEmail(email); acanthus.setPreferencePassword(password); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java index 8d4d1fa..74f9b86 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java @@ -8,6 +8,7 @@ import android.widget.Button; import android.widget.TextView; +import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.databinding.ActivitySignUpBinding; import org.ntlab.acanthus_client.entities.AccountUidJson; @@ -45,6 +46,8 @@ .build(); final AccountsRest accountsRest = retrofit.create(AccountsRest.class); + Acanthus acanthus = (Acanthus) getApplication(); + // 各フォーム取得 String name = binding.editTextTextSignUpPersonName.getText().toString(); String emailAddress = binding.editTextTextSignUpEmailAddress.getText().toString(); @@ -54,8 +57,12 @@ call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { - if (response.isSuccessful()) transitionLoginActivity(); - else clearForm(); + if (response.isSuccessful()) { + acanthus.setPreferenceName(name); + acanthus.setPreferenceEmail(emailAddress); + acanthus.setPreferencePassword(password); + transitionLoginActivity(); + } else clearForm(); } @Override