diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 09ad5d2..40840fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,6 +61,9 @@
         <activity
             android:name=".views.MainActivity"
             android:exported="true" />
+        <activity
+            android:name=".views.ChatActivity"
+            android:exported="false" />
     </application>
 
 </manifest>
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 37bf1b0..23eaf8e 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
@@ -2,6 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -29,6 +30,8 @@
 
   Tampopo tampopo;
 
+
+
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     tampopo = (Tampopo)getApplication();
@@ -60,6 +63,30 @@
 //      }
 //    });
 
+    Intent intent = getIntent();
+    String friendId = intent.getStringExtra("friendId");
+    String chatroomId = intent.getStringExtra("chatroomId");
+
+    Log.d("ChatDebug", "チャット相手ID: " + friendId);
+    Log.d("ChatDebug", "チャットルームID: " + chatroomId);
+
+    String myId = tampopo.getUserId();
+    String token = tampopo.getToken();
+    chatroomViewModel.enterChatroom(myId, friendId, token);
+
+    if (friendId == null || friendId.isEmpty()) {
+      Log.e("ChatDebug","Error: friendIdがnullです");
+    }
+
+    chatroomViewModel.getChatroomIdLiveData().observe(this, id -> {
+      if (id != null) {
+        tampopo.setChatroomId(id);
+        System.out.println("チャットルーム作成完了！ ID: " + id);
+      } else {
+        System.out.println("チャットルーム作成に失敗しました");
+      }
+    });
+
 
     //メッセージ送信
     sendButton.setOnClickListener(new OnClickListener() { //sendButtonがクリックされたときの処理
@@ -70,7 +97,7 @@
             String senderId = tampopo.getUserId();
             String token = tampopo.getToken();
             String chatroomId = tampopo.getChatroomId();
-            chatroomViewModel.sendMessage(chatroomId, senderId, senderText, token);
+            chatroomViewModel.sendMessage(chatroomId, senderId, senderText, token, false);
             senderMessage.setText(senderText);//自分のメッセージを送信欄に表示
           }
       }