diff --git a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java
index 5cb2c5a..64a5c94 100644
--- a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java
@@ -2,11 +2,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.content.Intent;
-
 import android.view.View;
 import android.view.View.OnClickListener;
-
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
@@ -16,11 +13,12 @@
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.lifecycle.ViewModelProvider;
-import com.example.tampopo_client.viewmodels.UserViewModel;
-import com.example.tampopo_client.views.MainActivity;
 import com.example.tampopo_client.R;
+import com.example.tampopo_client.Tampopo;
+import com.example.tampopo_client.viewmodels.UserViewModel;
 
 public class LoginActivity extends AppCompatActivity {
+
   UserViewModel userViewModel;
 
   @Override
@@ -35,28 +33,30 @@
     });
     userViewModel = new ViewModelProvider(this).get(UserViewModel.class);
 
-    userViewModel.getToken().observe(this, token -> {
-      if (token != null) {
-        // → ログイン成功。次の画面へ遷移
-        Intent i = new Intent(this, MainActivity.class);
-        i.putExtra("TOKEN", token);
-        startActivity(i);
-        finish();
-      }
-    });
     userViewModel.getError().observe(this,
-        msg -> { if (msg != null) Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); });
+        msg -> {
+          if (msg != null) {
+            Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+          }
+        });
 
     Button button_login = (Button) findViewById(R.id.loginbutton);
-    button_login.setOnClickListener(new OnClickListener(){
+    button_login.setOnClickListener(new OnClickListener() {
 
-      public void onClick(View v){
-        EditText useridInput = (EditText)findViewById(R.id.userIDText);
+      private Object getApplication;
+
+      public void onClick(View v) {
+        EditText useridInput = (EditText) findViewById(R.id.userIDText);
         String userid = useridInput.getText().toString();
-        EditText passwordInput = (EditText)findViewById(R.id.PasswordText);
+        EditText passwordInput = (EditText) findViewById(R.id.PasswordText);
         String password = passwordInput.getText().toString();
         userViewModel.login(userid, password);
 
+        userViewModel.getToken().getValue();
+        //TODO:上記のトークンを使ってTampopoクラスにセットするコードを書く
+        //((Tampopo)this.getApplication).setToken(token);
+
+
         Intent intent = new Intent(LoginActivity.this, MainActivity.class);
         startActivity(intent);
 
@@ -64,9 +64,9 @@
     });
 
     Button button_createaccount = (Button) findViewById(R.id.createaccountbutton);
-    button_createaccount.setOnClickListener(new OnClickListener(){
+    button_createaccount.setOnClickListener(new OnClickListener() {
 
-      public void onClick(View v){
+      public void onClick(View v) {
         Intent intent = new Intent(LoginActivity.this, RegisterActivity.class);
         startActivity(intent);
       }