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 c680dea..0be32fb 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
@@ -70,9 +70,9 @@
 
 
     String myId = tampopo.getUserId();
-    //String friendId = tampopo.get
-    //String chatroomId = tampopo.getChatroomId();
-    String chatroomId = "0";
+    String friendId = tampopo.getChatFriendId();
+    String chatroomId = tampopo.getChatroomId();
+    //String chatroomId = "0";
     String token = tampopo.getToken();
 
     // chatroomViewModel.enterChatroom(myId, friendId, token);
@@ -100,8 +100,8 @@
           if (!senderText.isEmpty()) { //senderTextが空でなければ
             String senderId = tampopo.getUserId();
             String token = tampopo.getToken();
-//          String chatroomId = tampopo.getChatroomId();
-            String chatroomId = "0";
+            String chatroomId = tampopo.getChatroomId();
+            //String chatroomId = "0";
             chatroomViewModel.sendMessage(chatroomId, senderId, senderText, token);
             senderMessage.setText(senderText);//自分のメッセージを送信欄に表示
           }