diff --git a/app/src/main/java/com/example/nemophila/resources/AccountsRest.java b/app/src/main/java/com/example/nemophila/resources/AccountsRest.java index 75354d8..20af87c 100644 --- a/app/src/main/java/com/example/nemophila/resources/AccountsRest.java +++ b/app/src/main/java/com/example/nemophila/resources/AccountsRest.java @@ -48,7 +48,7 @@ @FormUrlEncoded @PUT("accounts/{uid}/pw") - Call changePw( + Call changePw( @Path("uid") String uid, @Field("oldPw") String oldPw, @Field("newPw") String newPw, @@ -57,7 +57,7 @@ @FormUrlEncoded @PUT("accounts/{uid}/name") - Call changeName( + Call changeName( @Path("uid") String uid, @Field("name") String name, @Field("token") String token diff --git a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java index 00577e1..b484c47 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java @@ -24,7 +24,8 @@ private final AccountsRest accountsRest; // ライブデータ - private final MutableLiveData accountLiveData; + private final MutableLiveData nameLiveData; + private final MutableLiveData pwLiveData; private final MutableLiveData> accountPostsLiveData; // コンストラクタ @@ -34,41 +35,20 @@ .addConverterFactory(JacksonConverterFactory.create()) .build(); this.accountsRest = retrofit.create(AccountsRest.class); - this.accountLiveData = new MutableLiveData<>(); + this.nameLiveData = new MutableLiveData<>(); + this.pwLiveData = new MutableLiveData<>(); this.accountPostsLiveData = new MutableLiveData<>(); } // ライブデータの取得(ゲッター) - public MutableLiveData getAccountLiveData() { return accountLiveData; } + public MutableLiveData getNameLiveData() { + return nameLiveData; + } + public MutableLiveData getPwLiveData() { + return pwLiveData; + } public MutableLiveData> getAccountPostsLiveData() { return accountPostsLiveData; } - // 対象のアカウント情報の取得 - public void getAccount(String uid) { - Call call = accountsRest.getAccount(uid); - - call.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if (response.isSuccessful()) { - AccountJson accountJson = response.body(); - setAccountLiveDataFromJson(accountJson); - } else { - System.out.println("GetAccount ResponseError"); - } - } - @Override - public void onFailure(Call call, Throwable t) { - System.out.println("GetAccount NetworkError" + t); - } - }); - } - - //AccountJsonからAccountを作成し,対象のライブデータに設定する - private void setAccountLiveDataFromJson(AccountJson aj) { - Account account = new Account(aj); - accountLiveData.setValue(account); - } - // 対象のアカウント情報の削除 public void deleteAccount(String uid) { Call call = accountsRest.deleteAccount(uid); @@ -91,19 +71,20 @@ // 対象のアカウントパスワードの変更 public void changePw(String uid, String oldPw, String newPw, String token) { - Call call = accountsRest.changePw(uid, oldPw, newPw, token); + Call call = accountsRest.changePw(uid, oldPw, newPw, token); - call.enqueue(new Callback() { + call.enqueue(new Callback() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(Call call, Response response) { if (response.isSuccessful()) { + pwLiveData.setValue(newPw); System.out.println("Success ChangePW"); } else { System.out.println("response error"); } } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call call, Throwable t) { System.out.println("correspondence error" + t); } }); @@ -111,19 +92,20 @@ // 対象のアカウント名の変更 public void changeName(String uid, String name, String token) { - Call call = accountsRest.changeName(uid, name, token); + Call call = accountsRest.changeName(uid, name, token); - call.enqueue(new Callback() { + call.enqueue(new Callback() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(Call call, Response response) { if (response.isSuccessful()) { + nameLiveData.setValue(name); System.out.println("Success ChangeName"); } else { System.out.println("response error"); } } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call call, Throwable t) { System.out.println("correspondence error" + t); } });