Merge lp:~j-4-deactivatedaccount/tomdroid/bugfix-800176 into lp:~tomdroid-maintainers/tomdroid/main

[Stefan Hammer]

Fix critical Bug #800176.

[Stefan Hammer (j-4-deactivatedaccount)]

I just realised, that my fix is rather quick and dirty than good.
In ViewNote.java -> showNote() there is a block of code, which does exactly the same.
I could also move this code to Note.java and just call the new method from Send() and showNote().

Maybe we should remove the title from the noteContent string at all in Note.java -> getNoteContent(). Is the title important in the content? This would save a lot of dirty workarounds to get rid of the title.

[Olivier Bilodeau (plaxx)]

> Maybe we should remove the title from the noteContent string at all in Note.java -> getNoteContent(). Is the title important in the content? This would save a lot of dirty workarounds to get rid of the title.

Yes, try that and lets see the patch. Try to keep the cleaner title removal technique or maybe even push that into the xml parser..

[lp:~j-4-deactivatedaccount/tomdroid/bugfix-800176]

233. By Stefan Hammer on 2011-09-04

Merged with lp:tomdroid

234. By Stefan Hammer on 2011-09-05

Moved Title-remover in Note class and called it from Send and ViewNote

[Stefan Hammer (j-4-deactivatedaccount)]

Thanks for reviewing the other stuff! I'll try to keep things more consistent.
I changed the bugfix now. I couldn't push the code into the xml parser - no idea how this should work. But i wrote a function in the Note class and called it from ViewNote and Send.

PS: I wrote the news file and found a misunderstanding. I haven't integrated the search system wide atm, because therefore i would have to remove the search history again and call notes as search suggestions. I don't know which way is better. Maybe i will write both with an option in preferences later.

Ready for review again!

review: Needs Resubmitting

[Stefan Hammer (j-4-deactivatedaccount)]

oh.. Tomdroid really appears in the system wide search. didn't realize this :-D
It just doesn't bring up search results while typing. one has to select Tomdroid specifically.
Awesome. Sorry for the confusion!

[lp:~j-4-deactivatedaccount/tomdroid/bugfix-800176]

235. By Stefan Hammer on 2011-09-05

Also included the improved feature graphic to get it into the master.

236. By Stefan Hammer on 2011-09-05

removed unneccesary change.

[Olivier Bilodeau (plaxx)]

I made some changes in the merge: it's not the caller's job to strip the title. It would be too easy to forget in the future. Instead, the title stripping is done when we assign the XML note-content to a note instead.

review: Approve

[Stefan Hammer (j-4-deactivatedaccount)]

Hi! Thanks for checking my work. I wasn't sure at all where to put it. I updated the master branch now and realized, that the title is not cropped when viewing the note and also when sending it. Is this on purpose?

[Olivier Bilodeau (plaxx)]

I found an important problem in the note-content tag stripping code when in SD Card sync that could cause the title from not stripping. I fixed it this afternoon (EDT) at revno 245: http://bazaar.launchpad.net/~tomdroid-maintainers/tomdroid/main/revision/245

Also, because this bug is on initial SD card sync, someone affected will already have the <note-content...> tag in its database (as opposed to Web sync users) and so a database delete / re-sync is required.

I'm not doing any work-arounds to parse an affected user nor am I writing a database upgrade-script because I lack the time and since we are read-only an uninstall / re-sync from SD is pretty painless and lossless. Also, most users won't even notice the difference and new notes will be parsed correctly.

Let me know if you still see the titles, you shouldn't.

[Stefan Hammer (j-4-deactivatedaccount)]

Thanks for the information. I deleted all the user data and now the titles are gone.
I also think, thats not worth the effort to write a workaround for this. In the worst case, the title is displayed... what the heck!

=== modified file 'data/Feature_Graphic.png'
Binary files data/Feature_Graphic.png	2011-07-10 19:47:32 +0000 and data/Feature_Graphic.png	2011-09-05 10:27:32 +0000 differ
=== modified file 'data/Feature_Graphic.xcf'
Binary files data/Feature_Graphic.xcf	2011-07-10 19:47:32 +0000 and data/Feature_Graphic.xcf	2011-09-05 10:27:32 +0000 differ
=== modified file 'src/org/tomdroid/Note.java'
--- src/org/tomdroid/Note.java	2010-10-14 03:51:26 +0000
+++ src/org/tomdroid/Note.java	2011-09-05 10:27:32 +0000
@@ -28,6 +28,7 @@
 
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.tomdroid.ui.Tomdroid;
 import org.tomdroid.util.NoteContentBuilder;
 import org.tomdroid.util.XmlUtils;
 
@@ -192,4 +193,14 @@
 		return new String("Note: "+ getTitle() + " (" + getLastChangeDate() + ")");
 	}
 	
+	public void removeTitle(SpannableStringBuilder noteContent) {
+		// get rid of the title that is doubled in the note's content
+		// using quote to escape potential regexp chars in pattern
+		Pattern removeTitle = Pattern.compile("^\\s*"+Pattern.quote(getTitle())+"\\n\\n"); 
+		Matcher m = removeTitle.matcher(noteContent);
+		if (m.find()) {
+			noteContent = noteContent.replace(0, m.end(), "");
+			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "stripped the title from note-content");
+		}
+	}
 }

=== modified file 'src/org/tomdroid/ui/ViewNote.java'
--- src/org/tomdroid/ui/ViewNote.java	2011-09-04 15:30:54 +0000
+++ src/org/tomdroid/ui/ViewNote.java	2011-09-05 10:27:32 +0000
@@ -169,14 +169,7 @@
 	private void showNote() {
 		//setTitle(note.getTitle());
 
-		// get rid of the title that is doubled in the note's content
-		// using quote to escape potential regexp chars in pattern
-		Pattern removeTitle = Pattern.compile("^\\s*"+Pattern.quote(note.getTitle())+"\\n\\n"); 
-		Matcher m = removeTitle.matcher(noteContent);
-		if (m.find()) {
-			noteContent = noteContent.replace(0, m.end(), "");
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "stripped the title from note-content");
-		}
+		note.removeTitle(noteContent);
 		
 		// show the note (spannable makes the TextView able to output styled text)
 		content.setText(noteContent, TextView.BufferType.SPANNABLE);

=== modified file 'src/org/tomdroid/util/Send.java'
--- src/org/tomdroid/util/Send.java	2011-01-15 22:25:39 +0000
+++ src/org/tomdroid/util/Send.java	2011-09-05 10:27:32 +0000
@@ -35,13 +35,11 @@
 			
 			//parsed ok - show
 			if(msg.what == NoteContentBuilder.PARSE_OK) {
-				String body = "";
-				
-				//remove title from content
-				if (noteContent.toString() != "") {
-					body = noteContent.toString().substring(note.getTitle().length()+2);
-				}
-
+				
+				note.removeTitle(noteContent);
+				
+				String body = noteContent.toString();
+				
 			    // Create a new Intent to send messages
 			    Intent sendIntent = new Intent(Intent.ACTION_SEND);
 			    // Add attributes to the intent