diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java index 0542318..937a321 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java @@ -4,11 +4,11 @@ import android.app.Application; import android.os.Bundle; -import org.ntlab.radishforandroidstudio.cactusClient.models.AccountsConnection; +import org.ntlab.radishforandroidstudio.cactusClient.models.Account; public class Cactus extends Application { - private AccountsConnection accountsConnection = null;//アカウント関連 + private Account myAccount = null; public Cactus() { @@ -50,10 +50,17 @@ }); } - //accountの設定 - public AccountsConnection getAccountsConnection() { -// accountsConnection = new AccountsConnection(); - return accountsConnection; + + + public Account getMyAccount(){ + + return null; + } + + public Account setMyAccount(Account ac){ + + return ac; } } + diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java index 4718069..87d46d4 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java @@ -2,6 +2,7 @@ import static org.apache.commons.lang3.RandomStringUtils.random; +//あとで最新版に変える必要がある public class Account { private String id,name, pass, token; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AccountsConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AccountsConnection.java deleted file mode 100644 index 4dfeaaf..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AccountsConnection.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.models; - -import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection; -import org.w3c.dom.Element; - -public class AccountsConnection extends HttpAsyncConnection { - public AccountsConnection(String url) { - super(url); - } - - @Override - protected void receive(Element root) { - - } -// public AccountsConnection() { -// super("http://nitta-lab-www2.is.konan-u.ac.jp:8080/Cactus/accounts"); -// -// } - -}