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 2f2cf5b..20af87c 100644 --- a/app/src/main/java/com/example/nemophila/resources/AccountsRest.java +++ b/app/src/main/java/com/example/nemophila/resources/AccountsRest.java @@ -30,7 +30,7 @@ ); @GET("accounts/{uid}") - Response getAccount( + Call getAccount( @Path("uid") String uid ); 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 b646750..01f32f2 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java @@ -9,7 +9,6 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -23,6 +22,7 @@ // フィールド private final Retrofit retrofit; private final AccountsRest accountsRest; + // ライブデータ private final MutableLiveData accountLiveData; private final MutableLiveData> accountPostsLiveData; @@ -59,33 +59,24 @@ } // 対象のアカウント情報の取得 - public Account getAccount(String uid) throws IOException { -// Call call = accountsRest.getAccount(uid); + public void getAccount(String uid) { + Call call = accountsRest.getAccount(uid); - Response response = accountsRest.getAccount(uid); - if (response.isSuccessful()) { - Account account = new Account(response.body()); - return account; - } else { - throw new IOException(); - } - - -// 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("response error"); -// } -// } -// @Override -// public void onFailure(Call call, Throwable t) { -// System.out.println("correspondence error"); -// } -// }); + 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("response error"); + } + } + @Override + public void onFailure(Call call, Throwable t) { + System.out.println("correspondence error"); + } + }); } // 対象のアカウント情報の削除