Merge lp:~tomdroid-dev/tomdroid/sdsync-remove-notes into lp:~tomdroid-maintainers/tomdroid/main

[Stefan Hammer]

fixes bug #533933 with a few lines!

[lp:~tomdroid-dev/tomdroid/sdsync-remove-notes]

288. By Stefan Hammer on 2012-04-01

mistake in comment

[Olivier Bilodeau (plaxx)]

if you tested well, like you usually do, then go ahead and merge.

review: Approve

=== modified file 'NEWS'
--- NEWS	2012-03-31 22:07:31 +0000
+++ NEWS	2012-04-01 15:21:22 +0000
@@ -13,6 +13,7 @@
 
 -------------------------------------------------------------------------------
 Versoin 0.?? released on ??
+* SD card synchronisation now removes deleted messages from db (Stefan Hammer, lp:533933 )
 * Can specify folder for SD Card Sync (ie: dropbox) (Stefan Hammer, lp:837119)
 * Creating home-screen shortcuts to notes is now possible (Piotr Adamski, 
   lp:882703)

=== modified file 'src/org/tomdroid/sync/sd/SdCardSyncService.java'
--- src/org/tomdroid/sync/sd/SdCardSyncService.java	2012-03-31 19:30:28 +0000
+++ src/org/tomdroid/sync/sd/SdCardSyncService.java	2012-04-01 15:21:22 +0000
@@ -39,6 +39,7 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import java.io.*;
+import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -115,6 +116,15 @@
 			return;
 		}
 		
+		// Delete the notes that are not in the folder any more
+		ArrayList<String> remoteGuids = new ArrayList<String>();
+
+		for (int i = 0; i < fileList.length; i++) {
+			// make a list with all note guids stored in filenames
+			remoteGuids.add(fileList[i].getName().replace(".note", ""));
+		}
+		deleteNotes(remoteGuids);
+		
 		// every but the last note
 		for(int i = 0; i < fileList.length-1; i++) {
 			// TODO better progress reporting from within the workers