From: Randy Baumgarte <randy@fbn.cx>
Date: Sun, 10 Oct 2010 13:56:53 +0000 (-0400)
Subject: Correct possible data loss on sync.
X-Git-Tag: version0.1.1~314
X-Git-Url: http://git.sourceforge.jp/view?p=neighbornote%2FNeighborNote.git;a=commitdiff_plain;h=f4a3681a3af02dffbee9f351eb79dc67e2bd2e13;hp=2bb49c282cd0339520010a4a13d234342f390a8b

Correct possible data loss on sync.
---

diff --git a/src/cx/fbn/nevernote/threads/SyncRunner.java b/src/cx/fbn/nevernote/threads/SyncRunner.java
index 525545e..bb90835 100644
--- a/src/cx/fbn/nevernote/threads/SyncRunner.java
+++ b/src/cx/fbn/nevernote/threads/SyncRunner.java
@@ -876,11 +876,20 @@ public class SyncRunner extends QObject implements Runnable {
 			// Do the local deletes
 			logger.log(logger.EXTREME, "Doing local deletes");
 			List<String> guid = chunk.getExpungedNotes();
-			if (guid != null) 
+			if (guid != null) {
 				for (int i=0; i<guid.size() && keepRunning; i++) {
-					logger.log(logger.EXTREME, "Expunging local note from database");
-					conn.getNoteTable().expungeNote(guid.get(i), true, false);
+					String notebookGuid = "";
+					Note localNote = conn.getNoteTable().getNote(guid.get(i), false, false, false, false, false);
+					if (localNote != null) {
+						conn.getNoteTable().updateNoteSequence(guid.get(i), 0);
+						notebookGuid = localNote.getNotebookGuid();
+					}
+					if (!conn.getNotebookTable().isNotebookLocal(notebookGuid)) {
+						logger.log(logger.EXTREME, "Expunging local note from database");
+						conn.getNoteTable().expungeNote(guid.get(i), true, false);
+					}
 				}
+			}
 			guid = chunk.getExpungedNotebooks();
 			if (guid != null)
 				for (int i=0; i<guid.size() && keepRunning; i++) {