diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7bee9cc..c9e9a00 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <application
         android:name=".Tampopo"
         android:allowBackup="true"
diff --git a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java
index 0d44df8..e11d097 100644
--- a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java
@@ -22,7 +22,6 @@
 import android.widget.Toast;
 
 import androidx.activity.EdgeToEdge;
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
@@ -36,17 +35,16 @@
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
-import android.Manifest;
 import com.example.tampopo_client.R;
 import com.example.tampopo_client.Tampopo;
 import com.example.tampopo_client.models.Activity;
 import com.example.tampopo_client.viewmodels.ActivityViewModel;
-import com.example.tampopo_client.viewmodels.UserViewModel;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.example.tampopo_client.viewmodels.ActivityViewModelFactory;
 import com.example.tampopo_client.viewmodels.ChatViewModel;
 import com.example.tampopo_client.viewmodels.NotificationListener;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -126,10 +124,10 @@
 //            }
 //        });
 
-        MutableLiveData<Map<String, Activity>> activitiesLiveData = activityViewModel.getActivitiesLiveData();
-        activitiesLiveData.observe(this, new Observer<Map<String, Activity>>() {
+        MutableLiveData<List<Activity>> activitiesLiveData = activityViewModel.getActivitiesLiveDataFromUserId(tampopo.getUserId());
+        activitiesLiveData.observe(this, new Observer<List<Activity>>() {
             @Override
-            public void onChanged(Map<String, Activity> activities) {
+            public void onChanged(List<Activity> activities) {
                 updateActivityView(activities);
             }
         });
@@ -159,10 +157,10 @@
         openDialogButton.setOnClickListener(v -> showInputDialog());
 
         // 仮データを作る（ユーザID、コメント）
-        Map<String, Activity> mockActivities = new HashMap<>();
-        mockActivities.put("user01", new Activity("user01", "act01","ひま〜", "2025-09-25 10:00" ));
-        mockActivities.put("user02", new Activity("user02", "act02","勉強してるよ", "2025-09-25 10:01"));
-        mockActivities.put("user03", new Activity("user03", "act03","ねむい〜", "2025-09-25 10:02"));
+        List<Activity> mockActivities = new ArrayList<>();
+        mockActivities.add(new Activity("user01", "act01","ひま〜", "2025-09-25 10:00" ));
+        mockActivities.add(new Activity("user02", "act02","勉強してるよ", "2025-09-25 10:01"));
+        mockActivities.add(new Activity("user03", "act03","ねむい〜", "2025-09-25 10:02"));
 
 
         // 表示を更新
@@ -275,7 +273,7 @@
             case "user01":
                 return R.drawable.friend01_icon;
             case "user02":
-                return R.drawable.friend02_icon;
+                return R.drawable.friend04_icon;
             case "user03":
                 return R.drawable.friend03_icon;
             default:
@@ -283,7 +281,7 @@
         }
     }
 
-    private void updateActivityView(Map<String, Activity> activities) {
+    private void updateActivityView(List<Activity> activities) {
         //TextView comment = this.findViewById(R.id.friend01_comment);
         //for (Activity ac: activities.values()) {
         //    comment.setText(ac.getText());
@@ -292,9 +290,9 @@
         ///natty ユーザごとにコメントの更新をする
         LinearLayout messageList = findViewById(R.id.messageList);
 
-        for (Map.Entry<String, Activity> entry : activities.entrySet()) {
-            String userId = entry.getKey();
-            Activity activity = entry.getValue();
+        for (Activity entry : activities) {
+            String userId = entry.getUserId();
+            Activity activity = entry;
 
             View userView = userViews.get(userId);
 
diff --git a/app/src/main/res/drawable/friend02_icon.png b/app/src/main/res/drawable/friend02_icon.png
deleted file mode 100644
index 5e82c4b..0000000
--- a/app/src/main/res/drawable/friend02_icon.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable/friend04_icon.png b/app/src/main/res/drawable/friend04_icon.png
new file mode 100644
index 0000000..5e82c4b
--- /dev/null
+++ b/app/src/main/res/drawable/friend04_icon.png
Binary files differ