diff --git a/app/src/main/java/com/example/tampopo_client/Tampopo.java b/app/src/main/java/com/example/tampopo_client/Tampopo.java
index 4708cbd..895975a 100644
--- a/app/src/main/java/com/example/tampopo_client/Tampopo.java
+++ b/app/src/main/java/com/example/tampopo_client/Tampopo.java
@@ -11,6 +11,7 @@
   private String userId;
   private String password;
   private String chatroomId;
+  private String chatFriendId;
   private String mailaddress;
   private String nickname;
   private String icon;
@@ -44,6 +45,13 @@
   public void setChatroomId(String ChatroomId) {
     this.chatroomId = ChatroomId;
   }
+  public String getChatFriendId() {
+    return chatFriendId;
+  }
+
+  public void setChatFriendId(String ChatFriendId) {
+    this.chatFriendId = ChatFriendId;
+  }
 
   public String getMailaddress() { return mailaddress; }
 
diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java b/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
index 2d461a6..0fb5746 100644
--- a/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
+++ b/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
@@ -34,7 +34,6 @@
     private String friendUserNickname;
     private ChatViewModel chatViewModel;
 
-    // TODO: CHANGE
     //ActivityLiveData
     private final Observer<List<Activity>> activitiesObserver = new Observer<List<Activity>>() {
         @Override
@@ -46,13 +45,6 @@
         }
     };
 
-    //userLiveData
-    private final Observer<String> userObserver = new Observer<String>() {
-        @Override
-        public void onChanged(String user) {
-        }
-    };
-
     //chatLiveData
     private final Observer<String> chatObserver = new Observer<String>() {
         @Override
@@ -72,7 +64,7 @@
         return chatObserver;
     }
 
-    public FriendIconView(Context context, String friendUserId,String friendUserNickname, ChatViewModel chatViewModel) {
+    public FriendIconView(Context context, String friendUserId, String friendUserNickname, ChatViewModel chatViewModel) {
         this(context);
         this.friendUserId = friendUserId;
         this.friendUserNickname = friendUserNickname;
@@ -106,15 +98,6 @@
         mFriendIcon = findViewById(R.id.friend_icon);
         mFriendChatNotification = findViewById(R.id.chat_notification);
 
-        //true(チャット通知が来た時）なら表示
-        if (chatNotification) {
-            mFriendChatNotification.setVisibility(View.VISIBLE);
-        }
-        //false(チャット通知が来ていない）なら非表示
-        else {
-            mFriendChatNotification.setVisibility(View.GONE);
-        }
-
         //iconを押したらチャットを始めることができる（チャットのダイアログができたらFriendActivityを変更）
         mFriendIcon.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
@@ -122,7 +105,7 @@
                 if (chatNotification) {
                     answeringCallDialog(getContext(), FriendIconView.this.friendUserNickname);
                 } // 通話をかける場合
-                else if(!chatNotification){
+                else if (!chatNotification) {
                     showCallRequestDialog(getContext(), FriendIconView.this.friendUserNickname);
                 }
             }
@@ -130,7 +113,7 @@
     }
 
     //通話に出る際のダイアログの表示
-    public void answeringCallDialog(Context context, String fromUserNickname){
+    public void answeringCallDialog(Context context, String fromUserNickname) {
         Dialog fromDialog = new Dialog(context);
         fromDialog.setContentView(R.layout.dialog_chat_receved);
         fromDialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
@@ -151,6 +134,7 @@
             // 通話を開始する
             Tampopo tampopo = (Tampopo) ((MainActivity) getContext()).getApplication();
 //            String chatroomId = chatViewModel.enterChatroom(tampopo.getUserId(), friendUserId, tampopo.getToken());
+            tampopo.setChatFriendId(friendUserId);
 
             // ChatActivityに画面遷移する
             Context ctx = getContext();
@@ -184,7 +168,9 @@
 
             // 通話を開始する
             Tampopo tampopo = (Tampopo) ((MainActivity) getContext()).getApplication();
-//            String chatroomId = chatViewModel.enterChatroom(tampopo.getUserId(), friendUserId, tampopo.getToken());
+            String chatroomId = chatViewModel.enterChatroom(tampopo.getUserId(), friendUserId, tampopo.getToken());
+            tampopo.setChatroomId(chatroomId);
+            tampopo.setChatFriendId(friendUserId);
 
             // ChatActivityに画面遷移する
             Context ctx = getContext();
@@ -232,21 +218,6 @@
         }
     }
 
-//    public void setActivityLiveDataObserver(String uid, ActivityViewModel viewModel){
-//        activityObserver = new Observer<List<Activity>>() {
-
-    // TODO: CHANGE
-//    @Override
-//    public void onChanged(List<Activity> activityList) {
-//        if (activityList != null && !activityList.isEmpty()) {
-//            Activity act = activityList.get(0);
-//            friendActivity = act.getText();
-//            setAccount(act.getUserId());
-//        }
-//    }
-//        };
-//        viewModel.getActivitiesLiveDataFromUserId(uid).observeForever(activityObserver);
-//    }
 
     /**
      * FriendIconViewのアイコン画像を更新する
@@ -257,24 +228,5 @@
         Glide.with(getContext()).load(iconUrl).into(getImageView());
     }
 
-    //uidを引数にカスタムビューにニックネーム，コメント，アイコンをセットする
-//    public void setAccount(String uid, String iconUrl) {
-//        this.userId = uid;
-//        setNickname("nitta");
-//        //String imageUrl = "http://nitta-lab-www.is.konan-u.ac.jp/tampopo-data/icon" + uid + ".jpg";
-//        Glide.with(getContext()).load(iconUrl).into(getImageView());
-//    }
 
-    public void setChatNotification(boolean chat) {
-        //チャットを終了するときのonclickで一緒にsetChatNotification（false）もする（アイコン周りの赤丸を消す）
-        //true(チャット通知が来た時）なら表示
-        chatNotification = chat;
-        if (chat) {
-            mFriendChatNotification.setVisibility(View.VISIBLE);
-        }
-        //false(チャット通知が来ていない）なら非表示
-        else {
-            mFriendChatNotification.setVisibility(View.GONE);
-        }
-    }
 }