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 5f91723..f8c799b 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 @@ -83,7 +83,7 @@ }); //疑似的な通知のためにchatViewModelを定義する - chatViewModel = new ViewModelProvider(this).get(ChatViewModel.class); +// chatViewModel = new ViewModelProvider(this).get(ChatViewModel.class); //chatViewModel.addNotificationListener(this); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) @@ -206,6 +206,7 @@ assert friendIconView != null; activityViewModel.getActivitiesLiveDataFromUserId(friendUserId).removeObserver(friendIconView.getActivitiesObserver()); + chatViewModel.getChatFriendToMeLiveData().removeObserver(friendIconView.getChatObserver()); } // 1. recentUpdatedFriendsを更新する @@ -244,6 +245,8 @@ // 各FriendIconViewにActivityをobserveさせる activityViewModel.getActivitiesLiveDataFromUserId(friendId).observe(MainActivity.this, friendIconView.getActivitiesObserver()); + // 各FriendIconViewにChatをobserveさせる + chatViewModel.getChatFriendToMeLiveData().observe(MainActivity.this,friendIconView.getChatObserver()); } }); }