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 6fd5f59..47fbe12 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java @@ -1,14 +1,10 @@ package org.ntlab.radishforandroidstudio.cactusClient; +import android.accounts.Account; import android.app.Activity; -import android.app.ActivityManager; import android.app.Application; import android.os.Bundle; -import org.ntlab.radishforandroidstudio.cactusClient.models.Account; - -import java.util.List; - public class Cactus extends Application { private Account myAccount = null; @@ -18,13 +14,6 @@ registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() { @Override public void onActivityCreated(Activity activity, Bundle savedInstanceState) { - ActivityManager activityManager = ((ActivityManager) getSystemService(ACTIVITY_SERVICE)); - List taskInfo = activityManager.getRunningTasks(5); - int activity_num = taskInfo.get(0).numRunning; - if (activity_num <= 1) { - // loadの処理 - - } } @@ -46,13 +35,6 @@ @Override public void onActivityStopped(Activity activity) { - ActivityManager activityManager = ((ActivityManager) getSystemService(ACTIVITY_SERVICE)); - List taskInfo = activityManager.getRunningTasks(5); - int activity_num = taskInfo.get(0).numRunning; - if (activity_num <= 1) { - // saveの処理 - - } } @@ -71,7 +53,6 @@ public Account getMyAccount(){ - return myAccount; } 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 deleted file mode 100644 index 1d9fb3c..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.models; - -//あとで最新版に変える必要がある - -public class Account { - private String id, name, token; - @JSONHint(ignore = true) - private String pass, uniqueID; - @JSONHint(ignore = true) - private boolean login = false; - - public Account(String userID, String userName, String userPass) { - setId(userID); - setName(userName); - setPass(userPass); - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getPass() { - return pass; - } - - public void setPass(String pass) { - this.pass = pass; - } - - public boolean isLogin() { - return login; - } - - public void setLogin(boolean login) { - this.login = login; - } - - public String getToken() { - return token; - } - - public String formToken() { - token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC); - return token; - } - - public String getUniqueID() { - return uniqueID; - } - - public void setUniqueID(String uniqueID) { - this.uniqueID = uniqueID; - } -} \ No newline at end of file