diff --git a/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java b/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java index 9744d25..fab3efb 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java @@ -3,5 +3,11 @@ import android.app.Application; public class Amaryllis extends Application { - + private String token = null; + public String getToken() { + return token; + } + public void setToken(String token) { + this.token = token; + } } diff --git a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java index 4910d3b..1f00e1d 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java @@ -50,11 +50,12 @@ signUpButton.setEnabled(false); signUpButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - Call call = signUpService.PostSignUp(nameEditText.getText().toString(), passWordEditText.getText().toString(),""); + Call call = signUpService.PostSignUp(passWordEditText.getText().toString(), nameEditText.getText().toString()); call.enqueue(new Callback(){ @Override public void onResponse(Call call, Response response) { SignupJson signupJson =response.body(); + String token = signupJson.getToken(); Intent intent = new Intent(SignUpActivity.this, MapsActivity.class); startActivity(intent); } diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/SignupJson.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/SignupJson.java index ccba713..80e5a03 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/entities/SignupJson.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/SignupJson.java @@ -1,4 +1,32 @@ package org.ntlab.amaryllis.client.entities; public class SignupJson { + private String message; + private String uid; + + public String getMessage() { + return message; + } + + public String getUid() { + return uid; + } + + public void setMessage(String message) { + this.message = message; + } + + public void setUid(String uid) { + this.uid = uid; + } + + private String token = null; + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } diff --git a/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java b/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java index 27e72a6..b98db18 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java @@ -25,8 +25,7 @@ @POST("accounts") Call PostSignUp( @Field("password") String password, - @Field("name") String name, - @Field("message") String message + @Field("name") String name ); //アカウントのログイン