String dbcpswd;\r
private final TreeSet<String> ignoreTags;\r
private final TreeSet<String> ignoreNotebooks;\r
+ private final TreeSet<String> ignoreLinkedNotebooks;\r
\r
\r
\r
disableUploads = false;\r
ignoreTags = new TreeSet<String>();\r
ignoreNotebooks = new TreeSet<String>();\r
+ ignoreLinkedNotebooks = new TreeSet<String>();\r
\r
// setAutoDelete(false);\r
workQueue=new LinkedBlockingQueue<String>(MAX_QUEUED_WAITING);\r
for (int i=0; i<ignore.size(); i++) \r
ignoreNotebooks.add(ignore.get(i));\r
\r
+ ignore.clear();\r
+ ignore = conn.getSyncTable().getIgnoreRecords("LINKEDNOTEBOOK");\r
+ for (int i=0; i<ignore.size(); i++) \r
+ ignoreLinkedNotebooks.add(ignore.get(i));\r
+ \r
ignoreTags.clear();\r
ignore = conn.getSyncTable().getIgnoreRecords("TAG");\r
for (int i=0; i<ignore.size(); i++) \r
}\r
\r
status.message.emit(tr("Cleaning up"));\r
- List<String> notes = conn.getNoteTable().expungeIgnoreSynchronizedNotes(conn.getSyncTable().getIgnoreRecords("NOTEBOOK"), conn.getSyncTable().getIgnoreRecords("TAG"));\r
+ List<String> notes = conn.getNoteTable().expungeIgnoreSynchronizedNotes(conn.getSyncTable().getIgnoreRecords("NOTEBOOK"), \r
+ conn.getSyncTable().getIgnoreRecords("TAG"), conn.getSyncTable().getIgnoreRecords("LINKEDNOTEBOOK"));\r
if (notes.size() > 0)\r
syncSignal.refreshLists.emit();\r
\r
List<LinkedNotebook> books = conn.getLinkedNotebookTable().getAll();\r
for (int i=0; i<books.size(); i++) {\r
try {\r
- long lastSyncDate = conn.getLinkedNotebookTable().getLastSequenceDate(books.get(i).getGuid());\r
- int lastSequenceNumber = conn.getLinkedNotebookTable().getLastSequenceNumber(books.get(i).getGuid());\r
- linkedAuthResult = noteStore.authenticateToSharedNotebook(books.get(i).getShareKey(), authToken);\r
- SyncState linkedSyncState = \r
- noteStore.getLinkedNotebookSyncState(linkedAuthResult.getAuthenticationToken(), books.get(i));\r
- if (linkedSyncState.getUpdateCount() > lastSequenceNumber) {\r
- if (lastSyncDate < linkedSyncState.getFullSyncBefore()) {\r
- lastSequenceNumber = 0;\r
- }\r
+ long lastSyncDate = conn.getLinkedNotebookTable().getLastSequenceDate(books.get(i).getGuid());\r
+ int lastSequenceNumber = conn.getLinkedNotebookTable().getLastSequenceNumber(books.get(i).getGuid());\r
+ linkedAuthResult = noteStore.authenticateToSharedNotebook(books.get(i).getShareKey(), authToken);\r
+ SyncState linkedSyncState = \r
+ noteStore.getLinkedNotebookSyncState(linkedAuthResult.getAuthenticationToken(), books.get(i));\r
+ if (linkedSyncState.getUpdateCount() > lastSequenceNumber) {\r
+ if (lastSyncDate < linkedSyncState.getFullSyncBefore()) {\r
+ lastSequenceNumber = 0;\r
+ } \r
syncLinkedNotebook(books.get(i), lastSequenceNumber, linkedSyncState.getUpdateCount());\r
- }\r
+ }\r
\r
// Synchronize local changes\r
syncLocalLinkedNoteChanges(books.get(i));\r
try {\r
SyncChunk chunk = \r
noteStore.getLinkedNotebookSyncChunk(authToken, book, usn, 10, fullSync);\r
-// noteStore.getLinkedNotebookSyncChunk(linkedAuthResult.getAuthenticationToken(), book, usn, 10, fullSync);\r
\r
- syncRemoteNotes(chunk.getNotes(), fullSync, linkedAuthResult.getAuthenticationToken());\r
+ if (!ignoreLinkedNotebooks.contains(book.getGuid()))\r
+ syncRemoteNotes(chunk.getNotes(), fullSync, linkedAuthResult.getAuthenticationToken());\r
findNewLinkedTags(chunk.getNotes(), linkedAuthResult.getAuthenticationToken());\r
for (int i=0; i<chunk.getResourcesSize(); i++) {\r
syncRemoteResource(chunk.getResources().get(i), linkedAuthResult.getAuthenticationToken());\r
}\r
syncRemoteLinkedNotebooks(chunk.getNotebooks(), false, book);\r
-// String notebookGuid = conn.getLinkedNotebookTable().getNotebookGuid(book.getGuid());\r
SharedNotebook s = noteStore.getSharedNotebookByAuth(linkedAuthResult.getAuthenticationToken());\r
syncLinkedTags(chunk.getTags(), s.getNotebookGuid());\r
\r