diff --git a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java index 367fb6e..632820b 100644 --- a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java +++ b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java @@ -6,9 +6,8 @@ public class Cosmos extends Application { private String token=null; - private String curGroup=null; + private Group curGroup=null; private String uId=null; - private String gId=null; //token処理 public void setToken(String token){ @@ -19,10 +18,10 @@ } //Group処理 - public void setCurrentGroup(String g){ + public void setCurrentGroup(Group g){ curGroup = g; } - public String getCurentGroup(){ + public Group getCurentGroup(){ return curGroup; } @@ -33,12 +32,4 @@ public String getuId(){ return uId; } - - //gId処理 - public void setgId(String gId){ - this.gId = gId; - } - public String getgId(){ - return gId; - } } diff --git a/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java b/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java index c0cd0b6..5580a7e 100644 --- a/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java @@ -14,6 +14,7 @@ import com.example.cosmosclient.R; import com.example.cosmosclient.app.Cosmos; import com.example.cosmosclient.entities.CreateGroupResponse; +import com.example.cosmosclient.entities.Group; import com.example.cosmosclient.resources.GroupsRest; import retrofit2.Call; @@ -75,9 +76,11 @@ if (response.isSuccessful()) { //成功時 CreateGroupResponse result = response.body(); + Group g = new Group(result.gId,result.uri,groupNameText.getText().toString(),uId); + //app/CosmosにgIdを保存 Cosmos app = (Cosmos)getApplication(); - app.setgId(result.gId); + app.setCurrentGroup(g); Intent intent = new Intent(getApplication(), RequestListActivity.class); startActivity(intent);