T29573

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
index de44b6d..4aca709 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
@@ -446,8 +446,7 @@ public class EverFolderActivity extends BaseActivity implements LockListener {
                NodeDao dao = (NodeDao) NodeCacheDao.getInstance();
                top = dao.searchRoot();
                if (top == null) {
-                       EfException.msg(R.string.ErrorSystem, new EfException(
-                                       EfError.SYSTEM));
+                       // データ0件(データ未更新)
                        return;
                }
                updateList(top);

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/Initialize.java b/source/workspace/EverFolder/src/com/yuji/ef/Initialize.java
index 0d74941..efb123f 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/Initialize.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/Initialize.java
@@ -4,6 +4,9 @@ import android.content.Context;
 
 import com.yuji.ef.common.Constant;
 import com.yuji.ef.dao.DatabaseHelper;
+import com.yuji.ef.dao.IDao;
+import com.yuji.ef.dao.Lock;
+import com.yuji.ef.dao.LockDao;
 import com.yuji.ef.exception.EfError;
 import com.yuji.ef.exception.EfException;
 import com.yuji.ef.pref.EditPrefUtil;
@@ -31,6 +34,10 @@ public class Initialize {
                        util.setConfig("yuji-k64613", "TODO");
                        DatabaseHelper.init(context);
                        
+                       // #29573
+                       LockDao lockDao = (LockDao)LockDao.getInstance();
+                       lockDao.unlock(SettingActivity.class, Constant.LOCK_UPDATE_NOTE);
+                       
                        NoteUpdatorService.init(context);
                        
                        isInit = false;