diff --git a/app/src/main/java/com/example/nemophila/RequestedActivity.java b/app/src/main/java/com/example/nemophila/RequestedActivity.java index 8b4b2ad..19e1515 100644 --- a/app/src/main/java/com/example/nemophila/RequestedActivity.java +++ b/app/src/main/java/com/example/nemophila/RequestedActivity.java @@ -61,7 +61,7 @@ public void onClick(DialogInterface dialogInterface, int i) { Toast.makeText(RequestedActivity.this, userModel.getName(), Toast.LENGTH_SHORT).show(); System.out.println("承諾ボタンが押されました: " + userModel.getName()); -// friendViewModel.putFriend(uid, userModel.getId(), token); + friendViewModel.putFriend(uid, userModel.getName() ,userModel.getId(), token); } }) .setNegativeButton("Cancel", null) @@ -79,7 +79,7 @@ public void onClick(DialogInterface dialogInterface, int i) { Toast.makeText(RequestedActivity.this, userModel.getName(), Toast.LENGTH_SHORT).show(); System.out.println("拒否ボタンが押されました: " + userModel.getName()); -// friendViewModel.deleteRequested(uid, userModel.getId(), token); + friendViewModel.deleteRequested(uid, userModel.getId(), token); } }) .setNegativeButton("Cancel", null) diff --git a/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java index 3baa6b1..a7493ca 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java @@ -76,6 +76,7 @@ public void onResponse(Call call, Response response) { if (response.isSuccessful()) { addFriendLiveData(fid, name); + removeRequestedLiveData(fid); System.out.println("Successful"); } else { System.out.println("ResponseError: " + response.code());