From 4355690dbae506b460a18254da6d8ef7aefd4697 Mon Sep 17 00:00:00 2001 From: Yuji Konishi Date: Sat, 15 Sep 2012 11:01:17 +0900 Subject: [PATCH] FOO --- .../EverFolder/src/com/yuji/ef/EverFolderActivity.java | 8 ++++++-- .../EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java | 10 +++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java index 06f521b..b4b5799 100644 --- a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java +++ b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java @@ -569,6 +569,7 @@ public class EverFolderActivity extends BaseActivity implements LockListener { @Override public void sendLockResult(boolean b) { + lock = b; NodeDao dao = (NodeDao) NodeCacheDao.getInstance(); pref.put(Constant.PREF_UPDATE_DATA, Constant.OFF); @@ -596,8 +597,8 @@ public class EverFolderActivity extends BaseActivity implements LockListener { } if (isInCycle) { - LockDao lockDao = (LockDao) LockDao.getInstance(); - lock = lockDao.lock(this, Constant.LOCK_UPDATE_NOTE); +// LockDao lockDao = (LockDao) LockDao.getInstance(); +// lock = lockDao.lock(this, Constant.LOCK_UPDATE_NOTE); if (isInit) { status = ScreenStatus.Normal; @@ -610,6 +611,9 @@ public class EverFolderActivity extends BaseActivity implements LockListener { setStatus(); isInit = false; } else { + if (lock){ + updateList(); + } setStatus(); } } else { 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 9355a07..c02d204 100644 --- a/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java +++ b/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java @@ -57,9 +57,17 @@ public class NoteUpdateTask implements AsyncTaskIF { lockDao.unlock(SettingActivity.class, Constant.LOCK_UPDATE_NOTE); throw new EfException(EfError.SYSTEM); + } catch (Throwable e) { + EfException.msg(com.yuji.ef.R.string.ErrorUpdate); + Debug.d(this, null, e); + + LockDao lockDao = (LockDao) LockDao.getInstance(); + lockDao.unlock(SettingActivity.class, Constant.LOCK_UPDATE_NOTE); + + throw new EfException(EfError.SYSTEM); } } - + public void cancel() { } -- 2.11.0