T29700

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
index 345c9dc..48effbc 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
@@ -88,9 +88,11 @@ public class EverFolderActivity extends BaseActivity implements LockListener {
                        String action = intent.getAction();
 
                        if (action.equals(Constant.ACTION_MESSAGE)) {
-                               String msg = intent
-                                               .getStringExtra(Constant.ACTION_MESSAGE_MESSAGE);
-                               EfException.msg(EverFolderActivity.this, msg);
+                               if (isInCycle){
+                                       String msg = intent
+                                                       .getStringExtra(Constant.ACTION_MESSAGE_MESSAGE);
+                                       EfException.msg(EverFolderActivity.this, msg);
+                               }
                        } else if (action.equals(Constant.ACTION_UPDATE)) {
                                if (isInCycle && !lock) {
                                        LockDao lockDao = (LockDao) LockDao.getInstance();

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/OAuthActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/OAuthActivity.java
index 489cd16..699f65d 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/OAuthActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/OAuthActivity.java
@@ -127,10 +127,13 @@ public class OAuthActivity extends BaseActivity {
                if (isInit) {
                        isInit = false;
                } else {
+                       EvernoteUtil.getInstance().setSession(util.getSession());
                        if (isCompleteAuth) {
-                               EvernoteUtil.getInstance().setSession(util.getSession());
                                util.setLoginTime(this);
                        }
+                       else {
+                               util.logout(this);
+                       }
                        finish();
                }
        }
@@ -210,4 +213,4 @@ public class OAuthActivity extends BaseActivity {
        // return new File(Environment.getExternalStorageDirectory(),
        // APP_DATA_PATH);
        // }
-}
\ No newline at end of file
+}

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
index ae63d39..744477d 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
@@ -67,9 +67,11 @@ public class SettingActivity extends BaseActivity implements LockListener {
                        String action = intent.getAction();
 
                        if (action.equals(Constant.ACTION_MESSAGE)) {
-                               String msg = intent
-                                               .getStringExtra(Constant.ACTION_MESSAGE_MESSAGE);
-                               EfException.msg(SettingActivity.this, msg);
+                               if (isInCycle){
+                                       String msg = intent
+                                                       .getStringExtra(Constant.ACTION_MESSAGE_MESSAGE);
+                                       EfException.msg(SettingActivity.this, msg);
+                               }
                        } else if (action.equals(Constant.ACTION_UPDATE)) {
                                if (isInCycle && !lock) {
                                        LockDao lockDao = (LockDao) LockDao.getInstance();

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 4acd008..3fb40c2 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/service/NoteUpdatorService.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/service/NoteUpdatorService.java
@@ -215,8 +215,8 @@ public class NoteUpdatorService extends Service {
                }
 
                Calendar cal = Calendar.getInstance();
-               cal.add(Calendar.HOUR, (int) updateTime);
-               //cal.add(Calendar.SECOND, (int) 15); // TODO
+               //cal.add(Calendar.HOUR, (int) updateTime);
+               cal.add(Calendar.SECOND, 180); // TODO
 
                long t = cal.getTimeInMillis();
                PendingIntent alarmSender = PendingIntent.getService(context, 0,

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/utility/EvernoteUtil.java b/source/workspace/EverFolder/src/com/yuji/ef/utility/EvernoteUtil.java
index 83d971e..95dc81c 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/utility/EvernoteUtil.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/utility/EvernoteUtil.java
@@ -296,6 +296,9 @@ public class EvernoteUtil {
        private String getAuthenticationToken() {
                if (authenticationToken == null) {
                        authenticationToken = session.getAuthToken();
+                       if (authenticationToken == null) {
+                               return null;
+                       }
                        try {
                                noteStore = session.createNoteStore();
                        } catch (TTransportException e) {
@@ -431,4 +434,4 @@ public class EvernoteUtil {
 //             return false;
                return true;
        }
-}
\ No newline at end of file
+}