- Correct issue with importing when not a premium member.

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / threads / SyncRunner.java

diff --git a/src/cx/fbn/nevernote/threads/SyncRunner.java b/src/cx/fbn/nevernote/threads/SyncRunner.java
index 4709e6d..9933f25 100644 (file)
--- a/src/cx/fbn/nevernote/threads/SyncRunner.java
+++ b/src/cx/fbn/nevernote/threads/SyncRunner.java
@@ -198,6 +198,7 @@ public class SyncRunner extends QObject implements Runnable {
                        while(keepRunning) {\r
                                logger.log(logger.EXTREME, "Blocking until work is found");\r
                                String work = workQueue.take();\r
+                               logger.log(logger.LOW, "Dirty Notes Before Sync: " +new Integer(conn.getNoteTable().getDirtyCount()).toString());\r
                                logger.log(logger.EXTREME, "Work found: " +work);\r
                                if (work.equalsIgnoreCase("stop")) {\r
                                        idle=false;\r
@@ -225,6 +226,7 @@ public class SyncRunner extends QObject implements Runnable {
                                        syncSignal.errorDisconnect.emit();\r
                                        status.message.emit(tr("Error synchronizing - see log for details."));\r
                                }\r
+                               logger.log(logger.LOW, "Dirty Notes After Sync: " +new Integer(conn.getNoteTable().getDirtyCount()).toString());\r
                        }\r
                }       \r
                catch (InterruptedException e1) {\r
@@ -586,6 +588,7 @@ public class SyncRunner extends QObject implements Runnable {
        // Sync notes with Evernote\r
        private void syncLocalNotes() {\r
                logger.log(logger.HIGH, "Entering SyncRunner.syncNotes");\r
+               logger.log(logger.LOW, "Dirty local notes found: " +new Integer(conn.getNoteTable().getDirtyCount()).toString());\r
                status.message.emit(tr("Sending local notes."));\r
 \r
                List<Note> notes = conn.getNoteTable().getDirty();\r
@@ -1215,16 +1218,22 @@ public class SyncRunner extends QObject implements Runnable {
                // 3.) If a copy of the resource is in the local databbase and it is dirty and the hash doesn't match, we ignore it because there\r
                //     is a conflict.  The note conflict should get a copy of the resource at that time.\r
                \r
+               Note n = conn.getNoteTable().getNote(resource.getNoteGuid(), false, false, false, false, false);\r
+               if (n!=null) {\r
+                       logger.log(logger.HIGH, "Resource for note " +n.getGuid() +" : " +n.getTitle());\r
+               }\r
                boolean saveNeeded = false;\r
                /* #1 */                Resource r = getEvernoteResource(noteStore, resource.getGuid(), true,true,true, authToken);\r
                                                Resource l = conn.getNoteTable().noteResourceTable.getNoteResource(r.getGuid(), false);\r
                                                if (l == null) {\r
+                                                       logger.log(logger.HIGH, "Local resource not found");\r
                                                        saveNeeded = true;\r
                                                } else {\r
                /* #2 */                        boolean isNoteDirty = conn.getNoteTable().isNoteDirty(r.getNoteGuid());\r
-                                                       if (!isNoteDirty)\r
+                                                       if (!isNoteDirty) {\r
+                                                               logger.log(logger.HIGH, "Local resource found, but is not dirty");\r
                                                                saveNeeded = true;\r
-                                                       else {\r
+                                                       } else {\r
                /* #3 */                                String remoteHash = "";\r
                                                                if (r != null && r.getData() != null && r.getData().getBodyHash() != null)\r
                                                                        remoteHash = byteArrayToHexString(r.getData().getBodyHash());\r
@@ -1237,10 +1246,12 @@ public class SyncRunner extends QObject implements Runnable {
                                                        }\r
                                                }\r
                                                \r
+                                               logger.log(logger.HIGH, "Resource save needed: " +saveNeeded);\r
                                                if (saveNeeded) \r
                                                        conn.getNoteTable().noteResourceTable.updateNoteResource(r, false);\r
                                                if (r.getMime().equalsIgnoreCase("application/vnd.evernote.ink"))\r
                                                        downloadInkNoteImage(r.getGuid(), authToken);\r
+               \r
 \r
        }\r
        // Sync remote notes\r