TODO

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/IconFrameLayout.java b/source/workspace/EverFolder/src/com/yuji/ef/IconFrameLayout.java
index 39ad591..f942273 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/IconFrameLayout.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/IconFrameLayout.java
@@ -3,6 +3,8 @@ package com.yuji.ef;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.yuji.ef.exception.EfException;
+
 import android.content.Context;
 import android.graphics.PorterDuff.Mode;
 import android.graphics.Rect;
@@ -436,8 +438,7 @@ public class IconFrameLayout extends FrameLayout implements OnLongClickListener
 
                        return super.onTouchEvent(event);
                } catch (Exception e) {
-                       // TODO
-                       e.printStackTrace();
+                       EfException.msg(R.string.ErrorSystem, e);
                        return false;
                }
        }

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
index beacde5..8f90a4b 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
@@ -315,7 +315,7 @@ public class SettingActivity extends BaseActivity implements LockListener {
                boolean b = lockDao.move(NoteUpdateTask.LOCK_OBJ,
                                Constant.LOCK_UPDATE_NOTE);
                if (!b) {
-                       // TODO
+                       EfException.msg(R.string.ErrorSystem);
                        return;
                }
 
@@ -341,7 +341,6 @@ public class SettingActivity extends BaseActivity implements LockListener {
        }
 
        public void done(int errorCode) {
-               // TODO
                // // #29618
                // // lock = false;
                // lock = true;

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/dao/LockDao.java b/source/workspace/EverFolder/src/com/yuji/ef/dao/LockDao.java
index 64c5fe7..cb79c7d 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/dao/LockDao.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/dao/LockDao.java
@@ -230,13 +230,6 @@ public class LockDao implements IDao<Lock> {
                return obj.getClass().getName();
        }
 
-       // TODO
-       private String lockInfo = "<none>";
-
-       public String getLockInfo() {
-               return lockInfo;
-       }
-
        public boolean lock(Object obj, String key) {
                Calendar cal = Calendar.getInstance();
                long updated = cal.getTimeInMillis();
@@ -296,4 +289,11 @@ public class LockDao implements IDao<Lock> {
        public SQLiteDatabase getSQLiteDatabase() {
                return DatabaseHelper.getInstance(1).getSQLiteDatabase();
        }
+
+       // for DEBUG
+       private String lockInfo = "<none>";
+
+       public String getLockInfo() {
+               return lockInfo;
+       }
 }

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/service/NoteUpdatorService.java b/source/workspace/EverFolder/src/com/yuji/ef/service/NoteUpdatorService.java
index e2ad588..f22d5ff 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/service/NoteUpdatorService.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/service/NoteUpdatorService.java
@@ -57,8 +57,8 @@ public class NoteUpdatorService extends Service {
        private Runnable task = new Runnable() {
                public void run() {
                        try {
-                               //cancelAlermTime(NoteUpdatorService.this);
-                               
+                               // cancelAlermTime(NoteUpdatorService.this);
+
                                if (action.equals(ACTION_START)) {
                                        // 初期起動
                                } else {
@@ -93,13 +93,10 @@ public class NoteUpdatorService extends Service {
                                                                                .getString(R.string.serviceUpdateReferenceDataMsg));
                                                        }
                                                } catch (RollbackException e) {
-                                                       // TODO
-                                                       Debug.d(this, null, e);
-                                                       if (e.getError() == EfError.NETWORK){
-                                                               // TODO
-                                                               updateDate("ネットワークエラー");                                              
-                                                       }
-                                                       else {
+                                                       if (e.getError() == EfError.NETWORK) {
+                                                               updateDate(NoteUpdatorService.this
+                                                                               .getString(R.string.serviceUpdateDisableNetworkMsg));
+                                                       } else {
                                                                updateDate(NoteUpdatorService.this
                                                                                .getString(R.string.serviceUpdateUnexpectedErrorkMsg));
                                                        }
@@ -129,7 +126,8 @@ public class NoteUpdatorService extends Service {
 
                        Initialize.initialize(NoteUpdatorService.this, null);
 
-                       NoteUpdateTask task = new NoteUpdateTask(null, true, true, true, false);
+                       NoteUpdateTask task = new NoteUpdateTask(null, true, true, true,
+                                       false);
                        task.doExecute();
 
                        updateDate(null);
@@ -225,12 +223,12 @@ public class NoteUpdatorService extends Service {
                AlarmManager am = (AlarmManager) context
                                .getSystemService(Context.ALARM_SERVICE);
                am.set(AlarmManager.RTC, t, alarmSender);
-               
+
                pref.put(Constant.PREF_NEXT_TIME, t);
                pref.update();
        }
 
-       private static void cancelAlermTime(Context context){
+       private static void cancelAlermTime(Context context) {
                Calendar cal = Calendar.getInstance();
 
                long t = cal.getTimeInMillis();
@@ -240,7 +238,7 @@ public class NoteUpdatorService extends Service {
                                .getSystemService(Context.ALARM_SERVICE);
                am.cancel(alarmSender);
        }
-       
+
        public static void stopService(Context context) {
                PendingIntent alarmSender = PendingIntent.getService(context, 0,
                                new Intent(context, NoteUpdatorService.class),
@@ -266,22 +264,21 @@ public class NoteUpdatorService extends Service {
                long t = pref.getLong(Constant.PREF_NEXT_TIME);
                Calendar cal = Calendar.getInstance();
                long now = cal.getTimeInMillis();
-               if (t < now){
+               if (t < now) {
                        isSet = false;
-                       
+
                        // サービス起動中の場合は、DBロックがかかり
                        // 更新後まで、ロックは解除されない。
                        // TODO
                        // ロックを別DBにしたため、要検討
                        LockDao lockDao = (LockDao) LockDao.getInstance();
-                       lockDao.unlock(NoteUpdatorService.class,
-                                       Constant.LOCK_UPDATE_NOTE);
+                       lockDao.unlock(NoteUpdatorService.class, Constant.LOCK_UPDATE_NOTE);
                        lockDao.unlock(SettingActivity.class, Constant.LOCK_UPDATE_NOTE);
                        // TODO
                        lockDao.unlock(NoteUpdateTask.LOCK_OBJ, Constant.LOCK_UPDATE_NOTE);
                        lockDao = null;
                }
-               
+
                if (updateTime > 0) {
                        if (!isSet) {
                                // 再起動時

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java b/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java
index 0c4f810..2bf9617 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java
@@ -42,7 +42,6 @@ public class NoteUpdateTask implements AsyncTaskIF {
                } catch (RollbackException e) {
                        if (isDisplayError) {
                                if (e.getError() == EfError.NETWORK) {
-                                       // TODO
                                        EfException.msg(com.yuji.ef.R.string.ErrorNetwork);
                                } else {
                                        EfException.msg(com.yuji.ef.R.string.ErrorUpdate);
@@ -54,6 +53,9 @@ public class NoteUpdateTask implements AsyncTaskIF {
                        // LockDao lockDao = (LockDao) LockDao.getInstance();
                        // lockDao.unlock(SettingActivity.class, Constant.LOCK_UPDATE_NOTE);
 
+                       LockDao lockDao = (LockDao) LockDao.getInstance();
+                       lockDao.unlock(NoteUpdateTask.LOCK_OBJ, Constant.LOCK_UPDATE_NOTE);
+
                        throw e;
                } catch (Exception e) {
                        if (isDisplayError) {
@@ -65,6 +67,9 @@ public class NoteUpdateTask implements AsyncTaskIF {
                        // LockDao lockDao = (LockDao) LockDao.getInstance();
                        // lockDao.unlock(SettingActivity.class, Constant.LOCK_UPDATE_NOTE);
 
+                       LockDao lockDao = (LockDao) LockDao.getInstance();
+                       lockDao.unlock(NoteUpdateTask.LOCK_OBJ, Constant.LOCK_UPDATE_NOTE);
+
                        throw new EfException(EfError.SYSTEM);
                } catch (Throwable e) {
                        if (isDisplayError) {
@@ -76,6 +81,9 @@ public class NoteUpdateTask implements AsyncTaskIF {
                        // LockDao lockDao = (LockDao) LockDao.getInstance();
                        // lockDao.unlock(SettingActivity.class, Constant.LOCK_UPDATE_NOTE);
 
+                       LockDao lockDao = (LockDao) LockDao.getInstance();
+                       lockDao.unlock(NoteUpdateTask.LOCK_OBJ, Constant.LOCK_UPDATE_NOTE);
+
                        throw new EfException(EfError.SYSTEM);
                }
        }
@@ -89,8 +97,6 @@ public class NoteUpdateTask implements AsyncTaskIF {
                // LockDao lockDao = (LockDao) LockDao.getInstance();
                // lockDao.unlock(SettingActivity.class, Constant.LOCK_UPDATE_NOTE);
 
-               // TODO
-               // とりあえず正常系のみ
                LockDao lockDao = (LockDao) LockDao.getInstance();
                lockDao.unlock(NoteUpdateTask.LOCK_OBJ, Constant.LOCK_UPDATE_NOTE);