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 735dada..6ca0763 100644
--- a/app/src/main/java/com/example/tampopo_client/Tampopo.java
+++ b/app/src/main/java/com/example/tampopo_client/Tampopo.java
@@ -3,6 +3,9 @@
 import android.app.Application;
 
 public class Tampopo extends Application {
+  public String getUserId;
+
+  public String getToken;
   private String token;
   private String userId;
   private String password;
diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java b/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java
index 1d68ef5..003375b 100644
--- a/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java
+++ b/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java
@@ -14,6 +14,7 @@
 import android.view.ViewGroup;
 
 import com.example.tampopo_client.R;
+import com.example.tampopo_client.Tampopo;
 import com.example.tampopo_client.viewmodels.FriendViewModel;
 import com.example.tampopo_client.views.placeholder.FriendContent;
 
@@ -21,7 +22,7 @@
 import androidx.lifecycle.Observer;
 
 /**
- * A fragment representing a list of Items.
+ * フレンド一覧を表示するフラグメント
  */
 public class FriendListFragment extends Fragment {
 
@@ -86,6 +87,10 @@
         super.onViewCreated(view, savedInstanceState);
         FriendViewModel friendViewModel = new ViewModelProvider(this).get(FriendViewModel.class);
 
+        String userId = ((Tampopo) ((FriendActivity) view.getContext()).getApplication()).getUserId;
+        String token = ((Tampopo) ((FriendActivity) view.getContext()).getApplication()).getToken;
+        friendViewModel.loadFriends(userId, token);
+
         friendViewModel.getFriendIdsLiveData().observe(getViewLifecycleOwner(), new Observer<List<String>>() {
 
             @Override
diff --git a/app/src/main/java/com/example/tampopo_client/views/ProfileActivity.java b/app/src/main/java/com/example/tampopo_client/views/ProfileActivity.java
index 8f5a336..075b7ff 100644
--- a/app/src/main/java/com/example/tampopo_client/views/ProfileActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/ProfileActivity.java
@@ -48,32 +48,24 @@
 
 
         //決定ボタンを押したときにidとニックネームを保存
-        Button dicisionbutton = (Button) findViewById(R.id.dicisionbutton);
-
+        Button dicisionbutton = findViewById(R.id.dicisionbutton);
 
         dicisionbutton.setOnClickListener(new View.OnClickListener() {
-
-            private Object getApplication;
-
             public void onClick(View v) {
-                //ニックネームの変更
-                EditText usernicknameInput = (EditText) findViewById(R.id.nicknamebutton);
+                EditText usernicknameInput = findViewById(R.id.nicknamebutton);
                 String usernickname = usernicknameInput.getText().toString();
-                ((Tampopo) ProfileActivity.this.getApplication()).setNickname(usernickname);
 
-                //idの変更
-                EditText useridInput = (EditText) findViewById(R.id.idbutton);
+                EditText useridInput = findViewById(R.id.idbutton);
                 String userid = useridInput.getText().toString();
-                ((Tampopo) ProfileActivity.this.getApplication()).setUserId(userid);
 
-                //アイコンの変更
+                // Application（Tampopo）に保存（→SharedPreferencesにも自動保存される）
+                Tampopo app = (Tampopo) getApplication();
+                app.setNickname(usernickname);
+                app.setUserId(userid);
 
-
-                //決定を押したら設定画面に遷移
+                // 設定画面に戻る
                 Intent intent = new Intent(ProfileActivity.this, SettingActivity.class);
                 startActivity(intent);
-
-
             }
         });