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..1e062b7 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java @@ -11,7 +11,7 @@ import android.widget.EditText; import android.widget.TextView; -import org.ntlab.amaryllis.client.entities.SignupJson; +import org.ntlab.amaryllis.client.entities.SignUpJson; import org.ntlab.amaryllis.client.resources.AccountsRest; import retrofit2.Call; @@ -50,17 +50,18 @@ signUpButton.setEnabled(false); signUpButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - Call call = signUpService.PostSignUp(nameEditText.getText().toString(), passWordEditText.getText().toString(),""); - call.enqueue(new Callback(){ + 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(); + 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); } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call call, Throwable t) { } }); } 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 new file mode 100644 index 0000000..a658dc7 --- /dev/null +++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/SignUpJson.java @@ -0,0 +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/entities/SignupJson.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/SignupJson.java deleted file mode 100644 index ccba713..0000000 --- a/app/src/main/java/org/ntlab/amaryllis/client/entities/SignupJson.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ntlab.amaryllis.client.entities; - -public class SignupJson { -} 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..a2853df 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 @@ -2,7 +2,7 @@ import org.ntlab.amaryllis.client.entities.Account; import org.ntlab.amaryllis.client.entities.LoginJson; -import org.ntlab.amaryllis.client.entities.SignupJson; +import org.ntlab.amaryllis.client.entities.SignUpJson; import java.util.ArrayList; @@ -23,10 +23,9 @@ //アカウントの作成 @FormUrlEncoded @POST("accounts") - Call PostSignUp( + Call PostSignUp( @Field("password") String password, - @Field("name") String name, - @Field("message") String message + @Field("name") String name ); //アカウントのログイン