diff --git a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java index 380bc4b..89d6fed 100644 --- a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java @@ -69,7 +69,7 @@ String senderId = tampopo.getUserId(); String token = tampopo.getToken(); String chatroomId = tampopo.getChatroomId(); - chatViewModel.sendMessage(chatroomId, senderId, senderText, token); + chatViewModel.sendMessage(chatroomId, senderId, senderText, token, false); senderMessage.setText(senderText);//送信欄に表示 } } diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java b/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java index 20e07a1..c935fcd 100644 --- a/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java +++ b/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java @@ -108,7 +108,7 @@ // 受信した友達申請を管理する ViewModel を取得 FriendReceivedRequestViewModel friendReceivedRequestViewModel = new ViewModelProvider(this).get(FriendReceivedRequestViewModel.class); // サーバーから受信した友達リクエスト一覧をロード - friendReceivedRequestViewModel.loadReceivedRequests(tampopo.getToken()); + friendReceivedRequestViewModel.loadReceivedRequests(tampopo.getToken(), tampopo.getUserId()); // LiveData を監視して、データが変わったら RecyclerView に反映 friendReceivedRequestViewModel.getReceivedRequestsLiveData().observe(getViewLifecycleOwner(), new Observer>() {