diff --git a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java index 51964e4..31b9c7a 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java @@ -47,12 +47,12 @@ loginButton.setEnabled(false); loginButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - Call call = LoginService.accountLogin(passWordEditText.getText().toString(),uidEditText.getText().toString(),"",""); + Call call = LoginService.accountLogin(passWordEditText.getText().toString(),uidEditText.getText().toString()); call.enqueue(new Callback(){ @Override public void onResponse(Call call, Response response) { - //LoginJson loginJson =response.body(); - //String token = loginJson.getToken(); + LoginJson loginJson =response.body(); + String token = loginJson.getToken(); Intent intent = new Intent(LoginActivity.this, MapsActivity.class); startActivity(intent); } @@ -80,7 +80,8 @@ public void afterTextChanged(Editable s) { if(passWordTextView.length()>7 && uidTextView.length()>0 ){ loginButton.setEnabled(true); - } else{ + } + else{ loginButton.setEnabled(false); } }