テストケース追加。pref、プロセスkill対策作成中（バグあり）

[train-delayed/source.git] / workspace / TrainDelayed / src / com / td / HistoryActivity.java

diff --git a/workspace/TrainDelayed/src/com/td/HistoryActivity.java b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
index 5b140c8..9d95c7c 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/HistoryActivity.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
@@ -41,6 +41,8 @@ public class HistoryActivity extends BaseActivity {
 //     public static final String PREF_HIS_FROM = "HIS_FROM";\r
 //     public static final String PREF_HIS_TO = "HIS_TO";\r
 \r
+       public static final String PREF_HIS_DATA = "HIS_DATA";\r
+\r
        public static final int[] unit = { 10, 30, 60 };\r
 \r
        private EditPrefUtil pref = new EditPrefUtil(this);\r
@@ -125,6 +127,12 @@ public class HistoryActivity extends BaseActivity {
                        Date date = cal.getTime();\r
 \r
                        int H = 3;\r
+                       \r
+                       String data = pref.get(PREF_HIS_DATA);\r
+                       if (data != null){\r
+                               pref.restore(PREF_HIS_DATA);\r
+                       }\r
+\r
                        prefEnHour = pref.getInt(PREF_HIS_EN_HOUR, date.getHours());\r
                        prefEnMinute = pref.getInt(PREF_HIS_EN_MINUTE, date.getMinutes());\r
                        cal = Calendar.getInstance();\r
@@ -204,6 +212,18 @@ public class HistoryActivity extends BaseActivity {
                }\r
        }\r
 \r
+       @Override\r
+       protected void onStop() {\r
+               super.onStop();\r
+               \r
+               pref.save(PREF_HIS_DATA);\r
+       }\r
+\r
+       @Override\r
+       protected void onActivityResult(int requestCode, int resultCode, Intent data) {\r
+               super.onActivityResult(requestCode, resultCode, data);\r
+       }\r
+\r
        public static void init(Context context) {\r
                EditPrefUtil pref = new EditPrefUtil(context);\r
 \r
@@ -214,6 +234,8 @@ public class HistoryActivity extends BaseActivity {
                pref.remove(PREF_HIS_EN_HOUR);\r
                pref.remove(PREF_HIS_EN_MINUTE);\r
 \r
+               pref.remove(PREF_HIS_DATA);\r
+               \r
                pref.update();\r
        }\r
        \r