Merge lp:~benoit.garret/tomdroid/storage-redesign into lp:~tomdroid-maintainers/tomdroid/main

[Benoit Garret]

[Benoit Garret (benoit.garret)]

I'm finished with the work on this branch. I believe this is a good foundation for the snowy sync and other future features.

I tested it as best as I could fixing the bugs along the way, I don't think there should be many left.

[Olivier Bilodeau (plaxx)]

Big rough comment I quickly wrote down when I checked the commits. Its great work! Don't let my bad comments depress you in any way, I am a picky bastard. All of these items are easy to fix. Its just a matter of not losing track.

features
* remove close button, revno 142
* menuSyncWithSD remplaces automatic load, revno 143 (what about tango icon? for consistency)
* storage-redesign, revno 141, 144, 145, 146 (needs rework), 147, 148, 149, 150 (fixes problem introduced in 148), 151, 152, 153

foreseable bugs
* it doesn't do the right thing with a tomdroid/ filled sdcard right now (upgrade path broken)
* no mechansim to add notes in the list activity as of revno 144 (but its not necessary yet)
* revno 146, links directly from an activity to an external class that can take its time, bad. Always thread work that can be blocking (see http://developer.android.com/guide/topics/fundamentals.html)

open design questions
* who should responsable of adding a note to the NoteProvider? Note, Async.. or NoteProvider? see revno 147
* Tomdroid UI with file exceptions.. I don't like that, I think we should abstract that away using a static class in util package maybe? revno 149
* is Java's guid methods working the same way as mono ones? revno 153, 154

issues
* revno 148, what's up with NoteHandler's job?
* revno 149, onListItemClick, we should do ID instead of filenames now? (maybe fixed by 151)

revno 152
* Note = new note() and setting content inside of ViewNote, that's not the spirit, ViewNote should fetch a note based on some criteria and ask it to show itself, it shouldn't have to deal with a note's details
* buildlinkify pattern, should it really end up there?

why is revno155 and 156 necessary? what is it solving?
revno 157 - review some TODO task withdrawn in this commit, are the TODO items removed really dealt with?

TODO
Integrate changes into ChangeLog / NEWS

review: Needs Fixing

[Olivier Bilodeau (plaxx)]

I just cherrypicked the remove close commit.

[Olivier Bilodeau (plaxx)]

I created a branch to re-work only your sd card changes: lp:~plaxx/tomdroid/load-from-sdcard

Only items remaining:
* do you have an SVG source for your refresh (sync) icon (for data/icon-src/)? what is it license?
* I used grayscaled tango icons so far, do you like tango's action/view-refresh: http://commons.wikimedia.org/wiki/File:View-refresh.svg ? If not, its ok, I *really* don't mind keeping yours, I'm just being a consistency freak ;)

Aside from these, its complete.

I branched out of revno 143 of your storage-redesign branch to avoid cruft and reverted the db change so I don't suggest a merge back in your storage-redesign but a merge straight to main/ instead. Give it an eyeball and let me know. If you want, branch it and do some more fixing.

[Benoit Garret (benoit.garret)]

> Only items remaining:
> * do you have an SVG source for your refresh (sync) icon (for data/icon-src/)?
> what is it license?

I picked the icon in android git (http://android.git.kernel.org/), I don't know what license it is published under.
You can find it here: http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob;f=core/res/res/drawable/ic_menu_refresh.png;h=77d70dd4f0534271b71ef4eb87f5a7a917d944fa;hb=HEAD

> * I used grayscaled tango icons so far, do you like tango's action/view-
> refresh: http://commons.wikimedia.org/wiki/File:View-refresh.svg ? If not, its
> ok, I *really* don't mind keeping yours, I'm just being a consistency freak ;)

I'm fine with your icon, the one I put was merely a placeholder before finding something that was more consistent with the other ones in Tomdroid.

And I agree with you, consistency should be enforced as much as we can.

[Benoit Garret (benoit.garret)]

> Big rough comment I quickly wrote down when I checked the commits. Its great
> work! Don't let my bad comments depress you in any way, I am a picky bastard.
> All of these items are easy to fix. Its just a matter of not losing track.

I'm aware that the branch could use some work as I'm far from being an experienced programmer. But I'm comfortable with critics, keep them coming ;-).

> foreseable bugs
> * it doesn't do the right thing with a tomdroid/ filled sdcard right now
> (upgrade path broken)

The current behaviour is to overwrite the existing note with the same guid. This means it replaces the notes in the database with the ones on the SD card.

The problem I can see with this approach is that it doesn't delete the notes that don't exist anymore on the SD card. Apart from that, I don't see what would be broken in case of an upgrade.

> * no mechansim to add notes in the list activity as of revno 144 (but its not
> necessary yet)

The NoteProvider is used as the list store. This means the main list automatically picks up the notes that are inserted in the provider, there is no need to add them manually.

> * revno 146, links directly from an activity to an external class that can
> take its time, bad. Always thread work that can be blocking (see
> http://developer.android.com/guide/topics/fundamentals.html)

Agreed, I put a TODO to put this code in a thread but I forgot about it.

> open design questions
> * who should responsable of adding a note to the NoteProvider? Note, Async..
> or NoteProvider? see revno 147

Good question. What I have in mind is an abstraction of the provider which is currently a bit cumbersome to use. Something like a NoteManager, responsible for dealing with the provider (ie. inserting notes, getting a Note object from the provider, etc).

This would make these operations easier to do as its interfaces would only deal with Note objects, but I don't know if adding something like this would be overkill or not.

> * Tomdroid UI with file exceptions.. I don't like that, I think we should
> abstract that away using a static class in util package maybe? revno 149

I completely agree with that. Moreover, I'm not comfortable with presenting the errors as modal popups in the application. Something less intrusive would be to use the notification area and only present the full error message if the user clicks on the notification.

> * is Java's guid methods working the same way as mono ones? revno 153, 154

I believe so, the java and mono implementation are based on a RFC. The mono one is based on the draft[0] while the java one is based on the actual RFC[1].

[0]http://anonsvn.mono-project.com/viewvc/trunk/mcs/class/corlib/System/Guid.cs?revision=HEAD
[1]http://developer.android.com/reference/java/util/UUID.html

> issues
> * revno 148, what's up with NoteHandler's job?

Synchronization services like Snowy expect the note content to be sent as raw xml so I thought it would be a good idea to store it in the database.

The SpannableStringBuilder is now created lazily in the Note object which means that once the initial import is done, no xml parsing is required to show the main list.

> * revno 149, onListItemClick, we ...

[Olivier Bilodeau (plaxx)]

On Fri, Oct 2, 2009 at 2:21 PM, Benoit Garret <
<email address hidden>> wrote:

>
> > foreseable bugs
> > * it doesn't do the right thing with a tomdroid/ filled sdcard right now
> > (upgrade path broken)
>

> The current behaviour is to overwrite the existing note with the same guid.
> This means it replaces the notes in the database with the ones on the SD
> card.
>
>
I wasn't clear enough, what I meant was that when I first opened the app, it
was saying "no notes" although I knew that I had notes on the sd card. [Our
two] Users upgrading wouldn't expect that. In the sdcard branch, I added a
message that says that you need to sync first so this is fixed.

> The problem I can see with this approach is that it doesn't delete the
> notes that don't exist anymore on the SD card. Apart from that, I don't see
> what would be broken in case of an upgrade.
>

I added a TODO task in doc/dev/TODO to track that but I agree with you, this
is low-priority.

>
> > * no mechansim to add notes in the list activity as of revno 144 (but its
> not
> > necessary yet)
>
> The NoteProvider is used as the list store. This means the main list
> automatically picks up the notes that are inserted in the provider, there is
> no need to add them manually.
>

ok but the query on the provider is done at onCreate() time. What happens if
I add a note (I know this can't happen now but let's say it can) and come
back to the list without a re-run of onCreate() because the app was still in
memory. Will this be handled correctly? If you don't know, don't worry, we
will deal with it when the problem will surface.

[a few hours later]

Just did a propose for merge on your branch with some changes:
https://code.launchpad.net/~plaxx/tomdroid/storage-redesign/+merge/12858
look at it while its manageable and i'll do some more reviewing when I have
time for it (maybe tomorrow night if not then it'll be next weekend..)

--
Olivier Bilodeau <email address hidden>

[lp:~benoit.garret/tomdroid/storage-redesign]

158. By Benoit Garret on 2009-10-18

Merged main (incl. changes from the load-from-sdcard branch)

159. By Benoit Garret on 2009-10-18

Merge lp:~plaxx/tomdroid/storage-redesign, rev. 159 & 160.

160. By Benoit Garret on 2009-10-25

Remove the NoteCollection, it isn't used anywhere.

161. By Benoit Garret on 2009-10-25

Remove the load note from web feature.

162. By Benoit Garret on 2009-10-25

Created a NoteManager to handle the interactions with the content provider.

163. By Benoit Garret on 2009-10-31

Note.java: use NoteBuilder to parse the xml content
ViewNote.java: handle the asynchronous nature of Note.getNoteContent
NoteBuiler.java: handle the note content instead of the full note (ie. return a SpannableStringBuilder instead of a Note)

164. By Benoit Garret on 2010-01-17

Merged Olivier's branch

165. By Benoit Garret on 2010-01-17

Miscellaneous cleaning.

166. By Benoit Garret on 2010-01-17

Make the NoteManager methods static (the NoteManager didn't really have a state)

[Olivier Bilodeau (plaxx)]

Wow! I can't believe how much cruft was removed by this work. There were ugly pieces I did that we got rid of thanks to you!

Ok, I finally merged, here are the few things I've changed in the merge commit:

- added a toaster dialog to say that /sdcard/tomdroid/ is empty if you do an sdcard sync with nothing in that folder
- added/removed comments
- ViewNote's inner classes now private (instead of public and package)

I'm very satisfied of what you did. Thanks again!

Now, if you pull this new main into web-sync, how much effort would it take you to have it working and manageable / reviewable for someone like me? :)

review: Approve

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2009-10-05 04:28:32 +0000
+++ AndroidManifest.xml	2010-01-17 18:10:19 +0000
@@ -26,7 +26,7 @@
 			</intent-filter>
 		</activity>
 
-		<activity android:name=".ui.LoadWebNoteDialog" android:theme="@android:style/Theme.Dialog"></activity>
+		
 		
 		<provider android:name="NoteProvider"
             android:authorities="org.tomdroid.notes"

=== modified file 'doc/dev/TODO'
--- doc/dev/TODO	2009-06-25 01:17:57 +0000
+++ doc/dev/TODO	2010-01-17 18:10:19 +0000
@@ -16,6 +16,9 @@
 Port threading to Android's mechanism (maybe wait to check for 1.5's new API):
 - Check Handler / Looper / AsyncQueryHandler classes
 
+SD card sync:
+- Syncing from SD card only adds notes from the SD card and overwrite on identical guid. At some point, we'll have to consider deletions.
+
 File format: (to be in sync with Tomdroid's)
 - Why is title repeated in note text?
 - check everrnote dtd for inspiration: http://www.evernote.com/about/developer/

=== removed file 'res/layout/load_web_note_dialog.xml'
--- res/layout/load_web_note_dialog.xml	2009-06-21 20:21:30 +0000
+++ res/layout/load_web_note_dialog.xml	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
- Tomdroid
- Tomboy on Android
- http://www.launchpad.net/tomdroid
-
- Copyright 2008 Olivier Bilodeau <[e-mail]>
- 
- This file is part of Tomdroid.
- 
- Tomdroid is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- 
- Tomdroid is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:padding="10dip"
-	>
-
-	<TextView android:id="@+id/strURL" 
-			  android:layout_width="fill_parent" 
-			  android:layout_height="wrap_content" 
-			  android:text="@string/strURL" 
-			  />
-			  
-	<EditText android:id="@+id/txtURL"
-		      android:text="http://"
-		      android:singleLine="true"
-		      android:nextFocusDown="@+id/btnOk"
-			  android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		      android:layout_below="@+id/strURL"
-		      />
-		      
-    <Button android:id="@+id/btnOk" 
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/txtURL"
-            android:text="@string/btnOk"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="10pt"
-            />
-	
-    <Button android:id="@+id/btnCancel" 
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:layout_toLeftOf="@+id/btnOk"
-            android:layout_alignTop="@+id/btnOk"
-            android:text="@string/btnCancel" 
-            />
-            
-</RelativeLayout>
\ No newline at end of file

=== modified file 'res/menu/main.xml'
--- res/menu/main.xml	2009-10-03 16:26:37 +0000
+++ res/menu/main.xml	2010-01-17 18:10:19 +0000
@@ -23,11 +23,7 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<item 
-			android:icon="@drawable/icon_load_from_web"
-			android:title="@string/menuLoadWebNote"
-			android:id="@+id/menuLoadWebNote"
-			/>
+	
 	
 	<item 
 			android:icon="@drawable/icon_about"

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2009-10-03 16:26:37 +0000
+++ res/values/strings.xml	2010-01-17 18:10:19 +0000
@@ -32,7 +32,7 @@
     	There are no notes in Tomdroid\'s database. Make sure you copied Tomboy\'s note files (*.note) in
     	the tomdroid/ directory on your sdcard then press \"Menu\" and \"Sync with SD Card\".
     </string>
-    <string name="menuLoadWebNote">Note from the Web</string>
+    
     <string name="menuSyncWithSD">Sync with SD Card</string>
     <string name="menuAbout">About</string>
     <string name="strWelcome">
@@ -54,8 +54,8 @@
     </string>
 
 	<!-- load_web_note_dialog.xml -->
-	<string name="strLoadFromWebTitle">Note from the Web</string>
-    <string name="strURL">Enter the Note\'s URL:</string>
+	
+    
     <!-- TODO are these really needed!? -->
     <string name="btnOk">Ok</string>
     <string name="btnCancel">Cancel</string>

=== modified file 'src/org/tomdroid/Note.java'
--- src/org/tomdroid/Note.java	2009-06-21 20:25:16 +0000
+++ src/org/tomdroid/Note.java	2010-01-17 18:10:19 +0000
@@ -22,27 +22,26 @@
  */
 package org.tomdroid;
 
+import java.util.UUID;
+
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
+import org.tomdroid.util.NoteContentBuilder;
 
-import android.text.Spannable;
+import android.os.Handler;
 import android.text.SpannableStringBuilder;
-import android.text.style.StyleSpan;
 
 public class Note {
 
 	// Static references to fields (used in Bundles, ContentResolvers, etc.)
 	public static final String ID = "_id";
+	public static final String GUID = "guid";
 	public static final String TITLE = "title";
 	public static final String MODIFIED_DATE = "modified_date";
 	public static final String URL = "url";
 	public static final String FILE = "file";
-	public static final String NOTE_CONTENT = "note-content";
-	public static final int NOTE_RECEIVED_AND_VALID = 1;
-	public static final int NO_NOTES = 2;
-	public static final int NOTE_BADURL_OR_PARSING_ERROR = 3;
-	public static final String[] PROJECTION = { Note.ID, Note.TITLE, Note.FILE, Note.MODIFIED_DATE };
+	public static final String NOTE_CONTENT = "content";
 	
 	// Logging info
 	private static final String TAG = "Note";
@@ -56,12 +55,14 @@
 	public static final float NOTE_SIZE_HUGE_FACTOR = 1.6f;
 	
 	// Members
-	private SpannableStringBuilder noteContent = new SpannableStringBuilder();
+	private SpannableStringBuilder noteContent;
+	private String xmlContent;
 	private String url;
 	private String fileName;
 	private String title;
 	private DateTime lastChangeDate;
 	private int dbId;
+	private UUID guid;
 	
 	public Note() {}
 	
@@ -105,19 +106,28 @@
 		this.dbId = id;
 	}
 	
-	public SpannableStringBuilder getNoteContent() {
+	public UUID getGuid() {
+		return guid;
+	}
+	
+	public void setGuid(String guid) {
+		this.guid = UUID.fromString(guid);
+	}
+	
+	// TODO: should this handler passed around evolve into an observer pattern?
+	public SpannableStringBuilder getNoteContent(Handler handler) {
+		
+		// TODO not sure this is the right place to do this
+		noteContent = new NoteContentBuilder().setCaller(handler).setInputSource(xmlContent).build();
 		return noteContent;
 	}
-
-	public void setNoteContent(SpannableStringBuilder noteContent) {
-		this.noteContent = noteContent;
+	
+	public String getXmlContent() {
+		return xmlContent;
 	}
-
-	public SpannableStringBuilder getDisplayableNoteContent() {
-		SpannableStringBuilder sNoteContent = new SpannableStringBuilder(getNoteContent());
-		
-		sNoteContent.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 17, 35, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-		return sNoteContent;
+	
+	public void setXmlContent(String xmlContent) {
+		this.xmlContent = xmlContent;
 	}
 
 	@Override

=== removed file 'src/org/tomdroid/NoteCollection.java'
--- src/org/tomdroid/NoteCollection.java	2009-06-21 22:20:10 +0000
+++ src/org/tomdroid/NoteCollection.java	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-/*
- * Tomdroid
- * Tomboy on Android
- * http://www.launchpad.net/tomdroid
- * 
- * Copyright 2008, 2009 Olivier Bilodeau <[e-mail]>
- * 
- * This file is part of Tomdroid.
- * 
- * Tomdroid is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Tomdroid is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.tomdroid;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.tomdroid.ui.Tomdroid;
-import org.tomdroid.util.AsyncNoteLoaderAndParser;
-
-import android.os.Handler;
-import android.util.Log;
-
-// TODO Transform the NoteCollection into a Provider (see .../android-sdk-linux_x86-1.0_r1/docs/devel/data/contentproviders.html#creatingacontentprovider)
-// this would be more android-like
-public class NoteCollection {
-
-	// TODO This is not efficient, I maintain two list, one for the UI and the other for the actual data 
-	// the collection of notes
-	private List<Note> notes = new ArrayList<Note>();
-
-	// Logging info
-	private static final String TAG = "NoteCollection";
-	
-	public List<Note> getNotes() {
-		return notes;
-	}
-
-	public void setNotes(List<Note> notes) {
-		this.notes = notes;
-	}
-
-	public void addNote(Note note) {
-		notes.add(note);
-	}
-	
-	public boolean isEmpty() {
-		return notes.isEmpty();
-	}
-	
-	// TODO there is most likely a better way to do this
-	// TODO how does Tomboy deals with notes with duplicate titles? I have to check that out
-	public synchronized Note findNoteFromTitle(String title) {
-		if (Tomdroid.LOGGING_ENABLED) Log.d(TAG,"searching for note with title: "+title);
-		Iterator<Note> i = notes.iterator();
-		while(i.hasNext()) {
-			Note curNote = i.next();
-			if (curNote.getTitle().equalsIgnoreCase(title)) {
-				return curNote;
-			}
-		}
-		return null;
-	}
-	
-	// TODO there is most likely a better way to do this
-	public Note findNoteFromFilename(String filename) {
-		if (Tomdroid.LOGGING_ENABLED) Log.d(TAG,"searching for note with filename: "+filename);
-		Iterator<Note> i = notes.iterator();
-		while(i.hasNext()) {
-			Note curNote = i.next();
-			if (curNote.getFileName().equals(filename)) {
-				return curNote;
-			}
-		}
-		return null;
-	}
-	
-	// TODO also throw a empty exception that we will catch in tomdroid and display the empty notelist msg
-	public void loadNotes(Handler hndl) throws FileNotFoundException {
-		File notesRoot = new File(Tomdroid.NOTES_PATH);
-		
-		if (!notesRoot.exists()) {
-			throw new FileNotFoundException("Tomdroid notes folder doesn't exist. It is configured to be at: "+Tomdroid.NOTES_PATH);
-		}
-		
-		AsyncNoteLoaderAndParser asyncLoader = new AsyncNoteLoaderAndParser(notesRoot, this, hndl);
-		asyncLoader.readAndParseNotes();
-	}
-		
-	/**
-	 * Builds a regular expression pattern that will match any of the note title currently in the collection.
-	 * Useful for the Linkify to create the links to the notes.
-	 * @return regexp pattern
-	 */
-	public synchronized Pattern buildNoteLinkifyPattern()  {
-		
-		StringBuilder sb = new StringBuilder();
-		
-		for (Note n : notes) {
-			// Pattern.quote() here make sure that special characters in the note's title are properly escaped 
-			sb.append("("+Pattern.quote(n.getTitle())+")|");
-		}
-		
-		// get rid of the last | that is not needed (I know, its ugly.. better idea?)
-		String pt = sb.substring(0, sb.length()-1);
-
-		// return a compiled match pattern
-		return Pattern.compile(pt);
-	}
-
-	// singleton pattern
-	// TODO verify this singleton, I have no net access and I'm not quite sure I nailed it
-	private static NoteCollection nc;
-	
-	// FIXME the contract provided by this singleton is not correct. 
-	// If we instantiate this singleton, we expect it to be able to search through notes, which would not be the case
-	// since the loadNotes is called by Tomdroid and not the constructor or something else.
-	public static NoteCollection getInstance() {
-		if (nc == null) {
-			nc = new NoteCollection();
-		}
-		return nc;
-	}
-
-
-}

=== added file 'src/org/tomdroid/NoteManager.java'
--- src/org/tomdroid/NoteManager.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/NoteManager.java	2010-01-17 18:10:19 +0000
@@ -0,0 +1,154 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2009, 2010 Benoit Garret <[e-mail]>, Olivier Bilodeau <[e-mail]>
+ * 
+ * This file is part of Tomdroid.
+ * 
+ * Tomdroid is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Tomdroid is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.tomdroid;
+
+import org.tomdroid.ui.Tomdroid;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.Log;
+import android.widget.ListAdapter;
+import android.widget.SimpleCursorAdapter;
+
+public class NoteManager {
+	
+	public static final String[] FULL_PROJECTION = { Note.ID, Note.TITLE, Note.FILE, Note.NOTE_CONTENT, Note.MODIFIED_DATE };
+	public static final String[] LIST_PROJECTION = { Note.ID, Note.TITLE };
+	public static final String[] TITLE_PROJECTION = { Note.TITLE };
+	public static final String[] ID_PROJECTION = { Note.ID };
+	public static final String[] EMPTY_PROJECTION = {};
+	
+	// static properties
+	private static final String TAG = "NoteManager";
+	
+	// gets a note from the content provider
+	public static Note getNote(Activity activity, Uri uri) {
+		
+		Note note = null;
+		
+		// can we find a matching note?
+		Cursor cursor = activity.managedQuery(uri, FULL_PROJECTION, null, null, null);
+		// cursor must not be null and must return more than 0 entry 
+		if (!(cursor == null || cursor.getCount() == 0)) {
+			
+			// create the note from the cursor
+			cursor.moveToFirst();
+			String noteContent = cursor.getString(cursor.getColumnIndexOrThrow(Note.NOTE_CONTENT));
+			String noteTitle = cursor.getString(cursor.getColumnIndexOrThrow(Note.TITLE));
+			
+			note = new Note();
+			note.setXmlContent(noteContent);
+			note.setTitle(noteTitle);
+		}
+		
+		return note;
+	}
+	
+	// puts a note in the content provider
+	public static void putNote(Activity activity, Note note) {
+		
+		// verify if the note is already in the content provider
+		
+		// TODO make the query prettier (use querybuilder)
+		Uri notes = Tomdroid.CONTENT_URI;
+		String[] whereArgs = new String[1];
+		whereArgs[0] = note.getGuid().toString();
+		
+		// The note identifier is the guid
+		ContentResolver cr = activity.getContentResolver();
+		Cursor managedCursor = cr.query(notes,
+                EMPTY_PROJECTION,  
+                Note.GUID + "= ?",
+                whereArgs,
+                null);
+		activity.startManagingCursor(managedCursor);
+		
+		// Preparing the values to be either inserted or updated
+		// depending on the result of the previous query
+		ContentValues values = new ContentValues();
+		values.put(Note.TITLE, note.getTitle());
+		values.put(Note.FILE, note.getFileName());
+		values.put(Note.GUID, note.getGuid().toString());
+		values.put(Note.NOTE_CONTENT, note.getXmlContent());
+		
+		if (managedCursor.getCount() == 0) {
+			
+			// This note is not in the database yet we need to insert it
+			if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"A new note has been detected (not yet in db)");
+			
+    		Uri uri = cr.insert(Tomdroid.CONTENT_URI, values);
+
+    		if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Note inserted in content provider. ID: "+uri+" TITLE:"+note.getTitle()+" GUID:"+note.getGuid());
+		} else {
+			
+			// Overwrite the previous note if it exists
+			cr.update(Tomdroid.CONTENT_URI, values, Note.GUID+" = ?", whereArgs);
+			
+			if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Note updated in content provider. TITLE:"+note.getTitle()+" GUID:"+note.getGuid());
+		}
+	}
+	
+	public static ListAdapter getListAdapter(Activity activity) {
+		
+		// get a cursor representing all notes from the NoteProvider
+		Uri notes = Tomdroid.CONTENT_URI;
+		Cursor notesCursor = activity.managedQuery(notes, LIST_PROJECTION, null, null, null);
+		
+		// set up an adapter binding the TITLE field of the cursor to the list item
+		String[] from = new String[] { Note.TITLE };
+		int[] to = new int[] { R.id.note_title };
+		return new SimpleCursorAdapter(activity, R.layout.main_list_item, notesCursor, from, to);
+	}
+	
+	// gets the titles of the notes present in the db, used in ViewNote.buildLinkifyPattern()
+	public static Cursor getTitles(Activity activity) {
+		
+		// get a cursor containing the notes titles
+		return activity.managedQuery(Tomdroid.CONTENT_URI, TITLE_PROJECTION, null, null, null);
+	}
+	
+	public static int getNoteId(Activity activity, String title) {
+		
+		int id = 0;
+		
+		// get the notes ids
+		String[] whereArgs = { title };
+		Cursor cursor = activity.managedQuery(Tomdroid.CONTENT_URI, ID_PROJECTION, Note.TITLE+"=?", whereArgs, null);
+		
+		// cursor must not be null and must return more than 0 entry 
+		if (!(cursor == null || cursor.getCount() == 0)) {
+			
+			cursor.moveToFirst();
+			id = cursor.getInt(cursor.getColumnIndexOrThrow(Note.ID));
+		}
+		else {
+			// TODO send an error to the user
+			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "Cursor returned null or 0 notes");
+		}
+		
+		return id;
+	}
+}

=== modified file 'src/org/tomdroid/NoteProvider.java'
--- src/org/tomdroid/NoteProvider.java	2009-09-29 04:16:27 +0000
+++ src/org/tomdroid/NoteProvider.java	2010-01-17 18:10:19 +0000
@@ -43,6 +43,7 @@
 package org.tomdroid;
 
 import java.util.HashMap;
+import java.util.UUID;
 
 import org.tomdroid.ui.Tomdroid;
 
@@ -67,7 +68,7 @@
 	// --	
 	private static final String DATABASE_NAME = "tomdroid-notes.db";
 	private static final String DB_TABLE_NOTES = "notes";
-	private static final int DB_VERSION = 1;
+	private static final int DB_VERSION = 2;
 	// TODO once properly implemented, sort by: KEY_MODIFIED_DATE + " DESC"
 	private static final String DEFAULT_SORT_ORDER = Note.ID;
 	
@@ -95,8 +96,10 @@
         public void onCreate(SQLiteDatabase db) {
             db.execSQL("CREATE TABLE " + DB_TABLE_NOTES	 + " ("
                     + Note.ID + " INTEGER PRIMARY KEY,"
+                    + Note.GUID + " TEXT,"
                     + Note.TITLE + " TEXT,"
                     + Note.FILE + " TEXT,"
+                    + Note.NOTE_CONTENT + " TEXT,"
                     + Note.MODIFIED_DATE + " INTEGER"
                     + ");");
         }
@@ -204,6 +207,11 @@
         if (values.containsKey(Note.MODIFIED_DATE) == false) {
             values.put(Note.MODIFIED_DATE, now);
         }
+        
+        // The guid is the unique identifier for a note so it has to be set.
+        if (values.containsKey(Note.GUID) == false) {
+        	values.put(Note.GUID, UUID.randomUUID().toString());
+        }
 
         // TODO does this make sense?
         if (values.containsKey(Note.TITLE) == false) {
@@ -214,6 +222,10 @@
         if (values.containsKey(Note.FILE) == false) {
             values.put(Note.FILE, "");
         }
+        
+        if (values.containsKey(Note.NOTE_CONTENT) == false) {
+            values.put(Note.NOTE_CONTENT, "");
+        }
 
         SQLiteDatabase db = dbHelper.getWritableDatabase();
         long rowId = db.insert(DB_TABLE_NOTES, Note.FILE, values); // not so sure I did the right thing here
@@ -280,8 +292,10 @@
 
         notesProjectionMap = new HashMap<String, String>();
         notesProjectionMap.put(Note.ID, Note.ID);
+        notesProjectionMap.put(Note.GUID, Note.GUID);
         notesProjectionMap.put(Note.TITLE, Note.TITLE);
         notesProjectionMap.put(Note.FILE, Note.FILE);
+        notesProjectionMap.put(Note.NOTE_CONTENT, Note.NOTE_CONTENT);
         notesProjectionMap.put(Note.MODIFIED_DATE, Note.MODIFIED_DATE);
     }
 }

=== removed file 'src/org/tomdroid/ui/LoadWebNoteDialog.java'
--- src/org/tomdroid/ui/LoadWebNoteDialog.java	2009-04-06 22:27:27 +0000
+++ src/org/tomdroid/ui/LoadWebNoteDialog.java	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-/*
- * Tomdroid
- * Tomboy on Android
- * http://www.launchpad.net/tomdroid
- * 
- * Copyright 2008 Olivier Bilodeau <[e-mail]>
- * 
- * This file is part of Tomdroid.
- * 
- * Tomdroid is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Tomdroid is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.tomdroid.ui;
-
-import org.tomdroid.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-
-/**
- * This class is in charge of returning only the string of the URL to fetch from.
- */
-// TODO change superclass to a dialog (see .../docs/kb/commontasks.html#implementcallbacks)
-public class LoadWebNoteDialog extends Activity {
-	
-	// UI elements
-	private EditText txtURL;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        setContentView(R.layout.load_web_note_dialog);
-        setTitle(R.string.strLoadFromWebTitle);
-        
-        // Connect UI elements to variables
-        txtURL = (EditText) findViewById(R.id.txtURL);
-        // txtURL.setText("http://www.bottomlesspit.org/files/note.xml");
-        Button btnOk = (Button)findViewById(R.id.btnOk);
-        Button btnCancel = (Button)findViewById(R.id.btnCancel);
-        
-        // Annon inner-class for button listener 
-        btnOk.setOnClickListener(new OnClickListener() {
-        	
-            public void onClick(View v)
-            {
-                okClicked(txtURL.getText().toString());
-            }
-        });
-
-        // Annon inner-class for button listener 
-        btnCancel.setOnClickListener(new OnClickListener() {
-        	
-            public void onClick(View v)
-            {
-                cancelClicked();
-            }
-        });
-
-        
-	}
-	
-	private void okClicked(String url) {
-		
-		Bundle bundle = new Bundle();
-		bundle.putString(Tomdroid.RESULT_URL_TO_LOAD, url);
-		
-		Intent i = new Intent();
-		i.putExtras(bundle);
-		setResult(RESULT_OK, i);
-		finish();		
-	}
-
-	private void cancelClicked() {
-
-		setResult(RESULT_CANCELED);
-		finish();
-	}
-	
-}

=== modified file 'src/org/tomdroid/ui/Tomdroid.java'
--- src/org/tomdroid/ui/Tomdroid.java	2009-10-03 16:26:37 +0000
+++ src/org/tomdroid/ui/Tomdroid.java	2010-01-17 18:10:19 +0000
@@ -3,7 +3,7 @@
  * Tomboy on Android
  * http://www.launchpad.net/tomdroid
  * 
- * Copyright 2008, 2009 Olivier Bilodeau <[e-mail]>
+ * Copyright 2008, 2009, 2010 Olivier Bilodeau <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -22,15 +22,16 @@
  */
 package org.tomdroid.ui;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 
 import org.tomdroid.Note;
-import org.tomdroid.NoteCollection;
+import org.tomdroid.NoteManager;
 import org.tomdroid.R;
+import org.tomdroid.util.AsyncNoteLoaderAndParser;
 
 import android.app.AlertDialog;
 import android.app.ListActivity;
-import android.content.ContentValues;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.DialogInterface.OnClickListener;
@@ -38,14 +39,12 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ArrayAdapter;
+import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -62,24 +61,14 @@
 	// TODO hardcoded for now
 	public static final String NOTES_PATH = "/sdcard/tomdroid/";
 	// Logging should be disabled for release builds
-	public static final boolean LOGGING_ENABLED = false;
+	public static final boolean LOGGING_ENABLED = true;
 
 	// Logging info
 	private static final String TAG = "Tomdroid";
 	
-	// data keys
-	public static final String RESULT_URL_TO_LOAD = "urlToLoad"; 
-
-	// Activity result resources
-	private static final int ACTIVITY_GET_URL=0;
-	private static final int ACTIVITY_VIEW=1;
-	
-	// domain elements
-	private NoteCollection localNotes;
-	
 	// UI to data model glue
-	private ArrayAdapter<String> notesListAdapter;
 	private TextView listEmptyView;
+	private ListAdapter adapter;
 	
 	// Bundle keys for saving state
 	private static final String WARNING_SHOWN = "w";
@@ -111,15 +100,12 @@
 				.show();
         }
         
-	    // listAdapter that binds the UI to the notes names
-		notesListAdapter = new ArrayAdapter<String>(this, R.layout.main_list_item);
-        setListAdapter(notesListAdapter);
+        adapter = NoteManager.getListAdapter(this);
+		setListAdapter(adapter);
 
         // set the view shown when the list is empty
         listEmptyView = (TextView)findViewById(R.id.list_empty);
         getListView().setEmptyView(listEmptyView);
-        
-		localNotes = NoteCollection.getInstance();
     }
 
 	@Override
@@ -134,17 +120,21 @@
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-	        case R.id.menuLoadWebNote:
-	            showLoadWebNoteDialog();
-	            return true;
-	            
 	        case R.id.menuSyncWithSD:
-	            
-	            // start loading local notes
-	            if (LOGGING_ENABLED) Log.v(TAG, "Loading local notes");
-	            
-	        	try {
-	    			localNotes.loadNotes(handler);
+
+	        	// start loading local notes
+                if (LOGGING_ENABLED) Log.v(TAG, "Loading local notes");
+
+            	try {
+            		File notesRoot = new File(Tomdroid.NOTES_PATH);
+        		
+            		if (!notesRoot.exists()) {
+        			throw new FileNotFoundException("Tomdroid notes folder doesn't exist. It is configured to be at: "+Tomdroid.NOTES_PATH);
+            		}
+        		
+	        		AsyncNoteLoaderAndParser asyncLoader = new AsyncNoteLoaderAndParser(this, notesRoot);
+	        		asyncLoader.readAndParseNotes();
+        		
 	    		} catch (FileNotFoundException e) {
 	    			//TODO put strings in an external resource
 	    			listEmptyView.setText(R.string.strListEmptyNoNotes);
@@ -158,8 +148,8 @@
 	    				.show();
 	    			e.printStackTrace();
 	    		}
-	        	
-	        	return true;
+        	
+	    		return true;
 	        
 	        case R.id.menuAbout:
 				showAboutDialog();
@@ -216,109 +206,14 @@
 	}
 
 	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		
-		switch(requestCode) {
-			case ACTIVITY_GET_URL:
-				if (resultCode == RESULT_OK) {
-					String url = data.getExtras().getString(RESULT_URL_TO_LOAD);
-					loadNoteFromURL(url);
-				}
-		}
-	}
-	
-    private Handler handler = new Handler() {
-    	
-        @Override
-        public void handleMessage(Message msg) {
-        	
-        	// thread is done fetching a note and parsing went well 
-        	if (msg.what == Note.NOTE_RECEIVED_AND_VALID) {
-
-        		// update the note list with this newly parsed note
-        		updateNoteListWith(msg.getData().getString(Note.TITLE));
-        		
-        	} else if (msg.what == Note.NO_NOTES) {
-
-        		// if there are no notes, say so in the list_empty message
-    			listEmptyView.setText(R.string.strListEmptyNoNotes);
-        	}
-		}
-    };
-
-	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
-
-		// get the clicked note
-		Note n =  localNotes.findNoteFromTitle(notesListAdapter.getItem(position));
-		
-		Intent i = new Intent(Tomdroid.this, ViewNote.class);
-		i.putExtra(Note.FILE, n.getFileName());
-		startActivityForResult(i, ACTIVITY_VIEW);
-
-	}
-	
-	private void showLoadWebNoteDialog() {
-		
-    	Intent i = new Intent(Tomdroid.this, LoadWebNoteDialog.class);
-    	startActivityForResult(i, ACTIVITY_GET_URL);
-	}
-
-	private void loadNoteFromURL(String url) {
-		
-    	Intent i = new Intent(Tomdroid.this, ViewNote.class);
-        i.putExtra(Note.URL, url);
-        startActivity(i);
-	}
-	
-	private void updateNoteListWith(String noteTitle) {
-		
-		// add note to the note list
-		notesListAdapter.add(noteTitle);
-
-		// get the note instance we will work with that instead  from now on
-		Note note = localNotes.findNoteFromTitle(noteTitle);
-		
-		// verify if the note is already in the content provider
-		String[] projection = new String[] {
-			    Note.ID,
-			    Note.TITLE,
-			};
-
-		// TODO I could see a problem where someone delete a note and recreate one with the same title.
-		// It would been seen as not new although it is (it will have a new filename)
-		// TODO make the query prettier (use querybuilder)
-		Uri notes = Tomdroid.CONTENT_URI;
-		String[] whereArgs = new String[1];
-		whereArgs[0] = noteTitle;
-		Cursor managedCursor = managedQuery( notes,
-                projection,  
-                Note.TITLE + "= ?",
-                whereArgs,
-                Note.TITLE + " ASC");
-		if (managedCursor.getCount() == 0) {
-			
-			// This note is not in the database yet we need to insert it
-			if (LOGGING_ENABLED) Log.v(TAG,"A new note has been detected (not yet in db)");
-
-			// This add the note to the content Provider
-			// TODO PoC code that should be removed in next iteration's refactoring (no notecollection, everything should come from the provider I guess?)
-    		ContentValues values = new ContentValues();
-    		values.put(Note.TITLE, note.getTitle());
-    		values.put(Note.FILE, note.getFileName());
-    		Uri uri = getContentResolver().insert(CONTENT_URI, values);
-    		// now that we inserted the note put its ID in the note itself
-    		note.setDbId(Integer.parseInt(uri.getLastPathSegment()));
-
-    		if (LOGGING_ENABLED) Log.v(TAG,"Note inserted in content provider. ID: "+uri+" TITLE:"+noteTitle+" ID:"+note.getDbId());
-		} else {
-			
-			// find out the note's id and put it in the note
-		    if (managedCursor.moveToFirst()) {
-		        int idColumn = managedCursor.getColumnIndex(Note.ID);
-	            note.setDbId(managedCursor.getInt(idColumn));
-		    }
-		}
+		
+		Cursor item = (Cursor)adapter.getItem(position);
+		int noteId = item.getInt(
+						item.getColumnIndexOrThrow(Note.ID));
+		
+		Uri intentUri = Uri.parse(Tomdroid.CONTENT_URI+"/"+noteId);
+		Intent i = new Intent(Intent.ACTION_VIEW, intentUri, this, ViewNote.class);
+		startActivity(i);
 	}
 }

=== modified file 'src/org/tomdroid/ui/ViewNote.java'
--- src/org/tomdroid/ui/ViewNote.java	2009-06-21 20:25:16 +0000
+++ src/org/tomdroid/ui/ViewNote.java	2010-01-17 18:10:19 +0000
@@ -3,7 +3,7 @@
  * Tomboy on Android
  * http://www.launchpad.net/tomdroid
  * 
- * Copyright 2008, 2009 Olivier Bilodeau <[e-mail]>
+ * Copyright 2008, 2009, 2010 Olivier Bilodeau <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -22,14 +22,13 @@
  */
 package org.tomdroid.ui;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.tomdroid.Note;
-import org.tomdroid.NoteCollection;
+import org.tomdroid.NoteManager;
 import org.tomdroid.R;
-import org.tomdroid.util.NoteBuilder;
+import org.tomdroid.util.NoteContentBuilder;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -41,6 +40,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.SpannableStringBuilder;
 import android.text.util.Linkify;
 import android.text.util.Linkify.TransformFilter;
 import android.util.Log;
@@ -50,14 +50,12 @@
 // TODO this class is starting to smell
 public class ViewNote extends Activity {
 	
-	private String url;
-	private String file;
-	
 	// UI elements
 	private TextView content;
 	
 	// Model objects
 	private Note note;
+	private SpannableStringBuilder noteContent;
 	
 	// Logging info
 	private static final String TAG = "ViewNote";
@@ -68,60 +66,11 @@
 		super.onCreate(savedInstanceState);
 		
 		setContentView(R.layout.note_view);
-		
 		content = (TextView) findViewById(R.id.content);
-		
 		final Intent intent = getIntent();
-		
 		Uri uri = intent.getData();
-		if (uri == null) {
-			
-			// we were not fired by an Intent-filter so two choice here:
-			// get external web url or filename
-			Bundle extras = intent.getExtras();
-			if (extras != null) {
-
-				// lets grab both variables and test against null later
-				url = extras.getString(Note.URL);
-				file = extras.getString(Note.FILE);
-				
-				// Based on what was sent in the bundle, we either load from file or url
-				if (url != null) {
-
-					if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"ViewNote started: Loading a note from Web URL.");
-					
-					try {
-
-						note = new NoteBuilder().setCaller(handler).setInputSource(new URL(url)).build();
-					} catch (MalformedURLException e) {
-						// TODO catch correctly
-						e.printStackTrace();
-
-						// TODO put error string in a translatable resource
-						new AlertDialog.Builder(this)
-							.setMessage("Invalid URL")
-							.setTitle("Error")
-							.setNeutralButton("Ok", new OnClickListener() {
-								public void onClick(DialogInterface dialog, int which) {
-									dialog.dismiss();
-									finish();
-								}})
-							.show();
-					}
-
-				} else if (file != null) {
-
-					if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"ViewNote started: Loading a note based on a filename.");
-					note = NoteCollection.getInstance().findNoteFromFilename(file);
-					showNote();
-				} else {
-					
-					if (Tomdroid.LOGGING_ENABLED) Log.d(TAG,"ViewNote started: Bundle's content was not helpful to find which note to load..");
-				}
-			} else {
-				if (Tomdroid.LOGGING_ENABLED) Log.d(TAG,"ViewNote started: No extra information in the bundle, we don't know what to load");
-			}
-		} else {
+		
+		if (uri != null) {
 			
 			// We were triggered by an Intent URI 
 			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "ViewNote started: Intent-filter triggered.");
@@ -129,21 +78,45 @@
 			// TODO validate the good action?
 			// intent.getAction()
 			
-			// can we find a matching note?
-			Cursor cursor = managedQuery(uri, Note.PROJECTION, null, null, null);
-			// cursor must not be null and must return more than 0 entry 
-			if (!(cursor == null || cursor.getCount() == 0)) {
+			// TODO verify that getNote is doing the proper validation
+			note = NoteManager.getNote(this, uri);
+			
+			if(note != null) {
 				
-				cursor.moveToFirst();
-				String noteFilename = cursor.getString(cursor.getColumnIndexOrThrow(Note.FILE));
-				note = NoteCollection.getInstance().findNoteFromFilename(noteFilename);
-				showNote();
+				noteContent = note.getNoteContent(handler);
 				
 			} else {
 				
 				// TODO send an error to the user
-				if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "Cursor returned null or 0 notes");
+				if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "The note "+uri+" doesn't exist");
+				
+				// TODO put error string in a translatable resource
+				new AlertDialog.Builder(this)
+					.setMessage("The requested note could not be found. If you see this error by " +
+							    "mistake and you are able to replicate it, please file a bug!")
+					.setTitle("Error")
+					.setNeutralButton("Ok", new OnClickListener() {
+						public void onClick(DialogInterface dialog, int which) {
+							dialog.dismiss();
+							finish();
+						}})
+					.show();
 			}
+		} else {
+			
+			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "The Intent's data was null.");
+			
+			// TODO put error string in a translatable resource
+			new AlertDialog.Builder(this)
+			.setMessage("The requested note could not be found. If you see this error by " +
+					    "mistake and you are able to replicate it, please file a bug!")
+			.setTitle("Error")
+			.setNeutralButton("Ok", new OnClickListener() {
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+					finish();
+				}})
+			.show();
 		}
 	}
 	
@@ -160,55 +133,41 @@
 		return true;
 	}
 
-    private void showNote() {
+	private void showNote() {
 		// show the note (spannable makes the TextView able to output styled text)
-		content.setText(note.getNoteContent(), TextView.BufferType.SPANNABLE);
+		content.setText(noteContent, TextView.BufferType.SPANNABLE);
+		setTitle(note.getTitle());
 		
 		// add links to stuff that is understood by Android
 		// TODO this is SLOWWWW!!!!
 		Linkify.addLinks(content, Linkify.ALL);
 		
 		// This will create a link every time a note title is found in the text.
-		// The pattern is built by NoteCollection and contains a very dumb (title1)|(title2) escaped correctly
-		// Then we tranform the url from the note name to the note id to avoid characters that mess up with the URI (ex: ?)
+		// The pattern contains a very dumb (title1)|(title2) escaped correctly
+		// Then we transform the url from the note name to the note id to avoid characters that mess up with the URI (ex: ?)
 		Linkify.addLinks(content, 
-						 NoteCollection.getInstance().buildNoteLinkifyPattern(),
+						 buildNoteLinkifyPattern(),
 						 Tomdroid.CONTENT_URI+"/",
 						 null,
-						 
-						 // custom transform filter that takes the note's title part of the URI and translate it into the note id
-						 // this was done to avoid problems with invalid characters in URI (ex: ? is the query separator but could be in a note title)
-						 new TransformFilter() {
-
-							public String transformUrl(Matcher m, String str) {
-
-								// FIXME if this activity is called from another app and Tomdroid was never launched, getting here will probably make it crash
-								int id = 0;
-								try {
-									id = NoteCollection.getInstance().findNoteFromTitle(str).getDbId();
-								} catch (Exception e) {
-									if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "NoteCollection accessed but it was not ready for it..");
-								}
-								
-								// return something like content://org.tomdroid.notes/notes/3
-								return Tomdroid.CONTENT_URI.toString()+"/"+id;
-							}  
-						});
+						 noteTitleTransformFilter);
 	}
-
-	private Handler handler = new Handler() {
-    	
-        @Override
-        public void handleMessage(Message msg) {
-        	
-        	// thread is done fetching note and parsing went well 
-        	if (msg.what == Note.NOTE_RECEIVED_AND_VALID) {
-	        	showNote();
-        	} else if (msg.what == Note.NOTE_BADURL_OR_PARSING_ERROR) {
-        		
-        		// TODO put this String in a translatable resource
+	
+	public Handler handler = new Handler() {
+
+		@Override
+		public void handleMessage(Message msg) {
+			
+			//parsed ok - show
+			if(msg.what == NoteContentBuilder.PARSE_OK) {
+				showNote();
+
+			//parsed not ok - error
+			} else if(msg.what == NoteContentBuilder.PARSE_ERROR) {
+				
+				// TODO put this String in a translatable resource
 				new AlertDialog.Builder(ViewNote.this)
-					.setMessage("Error loading note from the Web due to a network error or a parsing error.")
+					.setMessage("The requested note could not be parsed. If you see this error by " +
+								"mistake and you are able to replicate it, please file a bug!")
 					.setTitle("Error")
 					.setNeutralButton("Ok", new OnClickListener() {
 						public void onClick(DialogInterface dialog, int which) {
@@ -218,5 +177,58 @@
 					.show();
         	}
 		}
-    };
+	};
+	
+	/**
+	 * Builds a regular expression pattern that will match any of the note title currently in the collection.
+	 * Useful for the Linkify to create the links to the notes.
+	 * @return regexp pattern
+	 */
+	public Pattern buildNoteLinkifyPattern()  {
+		
+		StringBuilder sb = new StringBuilder();
+		Cursor cursor = NoteManager.getTitles(this);
+		
+		// cursor must not be null and must return more than 0 entry 
+		if (!(cursor == null || cursor.getCount() == 0)) {
+			
+			String title;
+			
+			cursor.moveToFirst();
+			
+			do {
+				title = cursor.getString(cursor.getColumnIndexOrThrow(Note.TITLE));
+				
+				// Pattern.quote() here make sure that special characters in the note's title are properly escaped 
+				sb.append("("+Pattern.quote(title)+")|");
+				
+			} while (cursor.moveToNext());
+			
+			// get rid of the last | that is not needed (I know, its ugly.. better idea?)
+			String pt = sb.substring(0, sb.length()-1);
+
+			// return a compiled match pattern
+			return Pattern.compile(pt);
+			
+		} else {
+			
+			// TODO send an error to the user
+			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "Cursor returned null or 0 notes");
+		}
+		
+		return null;
+	}
+	
+	// custom transform filter that takes the note's title part of the URI and translate it into the note id
+	// this was done to avoid problems with invalid characters in URI (ex: ? is the query separator but could be in a note title)
+	TransformFilter noteTitleTransformFilter = new TransformFilter() {
+
+		public String transformUrl(Matcher m, String str) {
+
+			int id = NoteManager.getNoteId(ViewNote.this, str);
+			
+			// return something like content://org.tomdroid.notes/notes/3
+			return Tomdroid.CONTENT_URI.toString()+"/"+id;
+		}  
+	};
 }

=== modified file 'src/org/tomdroid/util/AsyncNoteLoaderAndParser.java'
--- src/org/tomdroid/util/AsyncNoteLoaderAndParser.java	2009-06-21 21:28:14 +0000
+++ src/org/tomdroid/util/AsyncNoteLoaderAndParser.java	2010-01-17 18:10:19 +0000
@@ -3,7 +3,7 @@
  * Tomboy on Android
  * http://www.launchpad.net/tomdroid
  * 
- * Copyright 2009 Olivier Bilodeau <[e-mail]>
+ * Copyright 2009, 2010 Olivier Bilodeau <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -28,51 +28,49 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
 import org.tomdroid.Note;
-import org.tomdroid.NoteCollection;
+import org.tomdroid.NoteManager;
 import org.tomdroid.ui.Tomdroid;
 import org.tomdroid.xml.NoteHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
+import android.app.Activity;
 import android.util.Log;
 
 public class AsyncNoteLoaderAndParser {
 	private final ExecutorService pool;
 	private final static int poolSize = 1;
+	private Activity activity;
 	private File path;
-	private NoteCollection noteCollection;
-	private Handler parentHandler;
+	
+	// regexp for <note-content..>...</note-content>
+	private static Pattern note_content = Pattern.compile(".*(<note-content.*>.*<\\/note-content>).*", Pattern.CASE_INSENSITIVE+Pattern.DOTALL);
 	
 	// logging related
 	private final static String TAG = "AsyncNoteLoaderAndParser";
 	
-	public AsyncNoteLoaderAndParser(File path, NoteCollection nc, Handler hndl) {
+	public AsyncNoteLoaderAndParser(Activity a, File path) {
+		this.activity = a;
 		this.path = path;
+		
 		pool = Executors.newFixedThreadPool(poolSize);
-		noteCollection = nc;
-		parentHandler = hndl;
 	}
 
 	public void readAndParseNotes() {
 		File[] fileList = path.listFiles(new NotesFilter());
 		
-		// If there are no notes, warn the UI through an empty message
-		if (fileList.length == 0) {
-			parentHandler.sendEmptyMessage(Note.NO_NOTES);
-		}
-		
 		for (File file : fileList) {
 
 			// give a filename to a thread and ask to parse it when nothing's left to do its over
@@ -91,13 +89,14 @@
 	}
 	
 	/**
-	 * The worker spawns a new note, parse the file its being given by the executor and add it to the NoteCollection
+	 * The worker spawns a new note, parse the file its being given by the executor.
 	 */
 	class Worker implements Runnable {
 		
 		// the note to be loaded and parsed
 		private Note note = new Note();
 		private File file;
+		final char[] buffer = new char[0x10000];
 		
 		public Worker(File f) {
 			file = f;
@@ -106,7 +105,9 @@
 		public void run() {
 			
 			note.setFileName(file.getAbsolutePath());
-			
+			// the note guid is not stored in the xml but in the filename
+			note.setGuid(file.getName().replace(".note", ""));
+
 			try {
 				// Parsing
 		    	// XML 
@@ -121,13 +122,12 @@
 		        NoteHandler xmlHandler = new NoteHandler(note);
 		        xr.setContentHandler(xmlHandler);
 
-		        
-		        // Create the proper input source based on if its a local note or a web note
-	        	FileInputStream fin = new FileInputStream(file);
-				BufferedReader in = new BufferedReader(new InputStreamReader(fin), 8192);
-				InputSource is = new InputSource(in);
-		        
-				if (Tomdroid.LOGGING_ENABLED) Log.v(TAG, "parsing note");
+		        // Create the proper input source
+		        FileInputStream fin = new FileInputStream(file);
+		        BufferedReader in = new BufferedReader(new InputStreamReader(fin), 8192);
+		        InputSource is = new InputSource(in);
+		        
+				if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "parsing note");
 				xr.parse(is);
 			
 			// TODO wrap and throw a new exception here
@@ -138,26 +138,38 @@
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
+
+			// extract the <note-content..>...</note-content>
+			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "retrieving what is inside of note-content");
 			
-			synchronized (noteCollection) {
-				noteCollection.addNote(note);
+			// FIXME here we are re-reading the whole note just to grab note-content out, there is probably a best way to do this
+			StringBuilder out = new StringBuilder();
+			try {
+				int read;
+				Reader reader = new InputStreamReader(new FileInputStream(file), "UTF-8");
+				
+				do {
+				  read = reader.read(buffer, 0, buffer.length);
+				  if (read>0) {
+				    out.append(buffer, 0, read);
+				  }
+				}
+				while (read>=0);
+				
+				Matcher m = note_content.matcher(out.toString());
+				if (m.find()) {
+					note.setXmlContent(m.group());
+				} else {
+					if (Tomdroid.LOGGING_ENABLED) Log.w(TAG, "Something went wrong trying to grab the note-content out of a note");
+				}
+
+			} catch (IOException e) {
+				// TODO handle properly
+				e.printStackTrace();
+				if (Tomdroid.LOGGING_ENABLED) Log.w(TAG, "Something went wrong trying to read the note");
 			}
 			
-			// notify UI that we are done here and send result 
-			warnHandler();
+			NoteManager.putNote(AsyncNoteLoaderAndParser.this.activity, note);
 		}
-		
-	    private void warnHandler() {
-			
-			// notify the main UI that we are done here (sending an ok along with the note's title)
-			Message msg = Message.obtain();
-			Bundle bundle = new Bundle();
-			bundle.putString(Note.TITLE, note.getTitle());
-			msg.setData(bundle);
-			msg.what = Note.NOTE_RECEIVED_AND_VALID;
-			
-			parentHandler.sendMessage(msg);
-	    }
-		
 	}
 }

=== renamed file 'src/org/tomdroid/util/NoteBuilder.java' => 'src/org/tomdroid/util/NoteContentBuilder.java'
--- src/org/tomdroid/util/NoteBuilder.java	2009-06-21 20:25:16 +0000
+++ src/org/tomdroid/util/NoteContentBuilder.java	2010-01-17 18:10:19 +0000
@@ -3,7 +3,7 @@
  * Tomboy on Android
  * http://www.launchpad.net/tomdroid
  * 
- * Copyright 2008, 2009 Olivier Bilodeau <[e-mail]>
+ * Copyright 2008, 2009, 2010 Olivier Bilodeau <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -22,43 +22,30 @@
  */
 package org.tomdroid.util;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
+import java.io.StringReader;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.tomdroid.Note;
 import org.tomdroid.ui.Tomdroid;
-import org.tomdroid.xml.NoteHandler;
+import org.tomdroid.xml.NoteContentHandler;
 import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
 
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.SpannableStringBuilder;
 import android.util.Log;
 
-/*
- * For now, you should only use this class for a Note fetched through the network
- * TODO remove duplication between here and AsyncNoteLoaderAndParser
- * 
- */
-public class NoteBuilder implements Runnable {
+public class NoteContentBuilder implements Runnable {
+	
+	public static final int PARSE_OK = 0;
+	public static final int PARSE_ERROR = 1;
 	
 	// Metadata for the Note that will be built
-	private File file;
-	private URL url;
-	// true means local note and false means Web note
-	private Boolean noteTypeLocal; // using the Object only to be able to test against null
+	private InputSource noteContentIs;
 	
 	// the object being built
-	private Note note = new Note();
+	private SpannableStringBuilder noteContent = new SpannableStringBuilder();
 	
 	private final String TAG = "NoteBuilder";
 	
@@ -66,94 +53,65 @@
 	private Thread runner;
 	private Handler parentHandler;
 	
-	public NoteBuilder () {}
+	public NoteContentBuilder () {}
 	
-	public NoteBuilder setCaller(Handler parent) {
+	public NoteContentBuilder setCaller(Handler parent) {
 		
 		parentHandler = parent;
 		return this;
 	}
 	
-	public NoteBuilder setInputSource(File f) {
-		
-		file = f;
-		note.setFileName(file.getAbsolutePath());
-		noteTypeLocal = new Boolean(true);
-		return this;
-	}
-	
-	public NoteBuilder setInputSource(URL u) {
-		
-		url = u;
-		noteTypeLocal = new Boolean(false);
-		return this;
-	}
-	
-	public Note build() {
+	public NoteContentBuilder setInputSource(String nc) {
+		
+		noteContentIs = new InputSource(new StringReader(nc));
+		return this;
+	}
+	
+	public SpannableStringBuilder build() {
 		
 		runner = new Thread(this);
 		runner.start();		
-		return note;
+		return noteContent;
 	}
 	
 	public void run() {
 		
+		boolean successful = true;
+		
 		try {
 			// Parsing
 	    	// XML 
 	    	// Get a SAXParser from the SAXPArserFactory
 	        SAXParserFactory spf = SAXParserFactory.newInstance();
+
+	        // trashing the namespaces but keep prefixes (since we don't have the xml header)
+	        spf.setFeature("http://xml.org/sax/features/namespaces", false);
+	        spf.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
 	        SAXParser sp = spf.newSAXParser();
-	
-	        // Get the XMLReader of the SAXParser we created
-	        XMLReader xr = sp.getXMLReader();
-	        
-	        // Create a new ContentHandler, send it this note to fill and apply it to the XML-Reader
-	        NoteHandler xmlHandler = new NoteHandler(note);
-	        xr.setContentHandler(xmlHandler);
-	        
-	        if (noteTypeLocal == null) {
-	        	// TODO find the proper exception to throw here.
-	        	throw new IllegalArgumentException("You are not respecting NoteBuilder's contract.");
-	        }
-	        
-	        // Create the proper input source based on if its a local note or a web note
-	        InputSource is;
-	        if (noteTypeLocal) {
 
-	        	FileInputStream fin = new FileInputStream(file);
-				BufferedReader in = new BufferedReader(new InputStreamReader(fin));
-				is = new InputSource(in);
-	        } else {
-	        	is = new InputSource(new BufferedInputStream((InputStream) url.getContent()));
-	        }
-	        
 			if (Tomdroid.LOGGING_ENABLED) Log.v(TAG, "parsing note");
-			xr.parse(is);
+	        sp.parse(noteContentIs, new NoteContentHandler(noteContent));
 		} catch (Exception e) {
+			e.printStackTrace();
 			// TODO handle error in a more granular way
-			warnHandler(false);
+			Log.e(TAG, "There was an error parsing the note.");
+			successful = false;
 		}
 		
-		// notify UI that we are done here and send result 
-		warnHandler(true);
+		warnHandler(successful);
 	}
 	
-    private void warnHandler(boolean successfull) {
+    private void warnHandler(boolean successful) {
 		
 		// notify the main UI that we are done here (sending an ok along with the note's title)
 		Message msg = Message.obtain();
-		if (successfull) {
-			Bundle bundle = new Bundle();
-			bundle.putString(Note.TITLE, note.getTitle());
-			msg.setData(bundle);
-			msg.what = Note.NOTE_RECEIVED_AND_VALID;
+		if (successful) {
+			msg.what = PARSE_OK;
 		} else {
 			
-			msg.what = Note.NOTE_BADURL_OR_PARSING_ERROR;
+			msg.what = PARSE_ERROR;
 		}
 		
 		parentHandler.sendMessage(msg);
     }
-
 }

=== added file 'src/org/tomdroid/xml/NoteContentHandler.java'
--- src/org/tomdroid/xml/NoteContentHandler.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/xml/NoteContentHandler.java	2010-01-17 18:10:19 +0000
@@ -0,0 +1,200 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2008, 2009, 2010 Olivier Bilodeau <[e-mail]>
+ * 
+ * This file is part of Tomdroid.
+ * 
+ * Tomdroid is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Tomdroid is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.tomdroid.xml;
+
+import org.tomdroid.Note;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.BulletSpan;
+import android.text.style.LeadingMarginSpan;
+import android.text.style.RelativeSizeSpan;
+import android.text.style.StrikethroughSpan;
+import android.text.style.StyleSpan;
+import android.text.style.TypefaceSpan;
+
+/*
+ * This class is responsible for parsing the xml note content
+ * and formatting the contents in a SpannableStringBuilder
+ */
+public class NoteContentHandler extends DefaultHandler {
+	
+	// position keepers
+	private boolean inNoteContentTag = false;
+	private boolean inBoldTag = false;
+	private boolean inItalicTag = false;
+	private boolean inStrikeTag = false;
+	private boolean inHighlighTag = false;
+	private boolean inMonospaceTag = false;
+	private boolean inSizeSmallTag = false;
+	private boolean inSizeLargeTag = false;
+	private boolean inSizeHugeTag = false;
+	private int inListLevel = 0;
+	private boolean inListItem = false;
+	
+	// -- Tomboy's notes XML tags names -- 
+	// Style related
+	private final static String NOTE_CONTENT = "note-content";
+	private final static String BOLD = "bold";
+	private final static String ITALIC = "italic";
+	private final static String STRIKETHROUGH = "strikethrough";
+	private final static String HIGHLIGHT = "highlight";
+	private final static String MONOSPACE = "monospace";
+	private final static String SMALL = "size:small";
+	private final static String LARGE = "size:large";
+	private final static String HUGE = "size:huge";
+	// Bullet list-related
+	private final static String LIST = "list";
+	private final static String LIST_ITEM = "list-item";
+	
+	// accumulate notecontent is this var since it spans multiple xml tags
+	private SpannableStringBuilder ssb;
+	
+	public NoteContentHandler(SpannableStringBuilder noteContent) {
+		
+		this.ssb = noteContent;
+	}
+	
+	@Override
+	public void startElement(String uri, String localName, String name,	Attributes attributes) throws SAXException {
+		
+		if (name.equals(NOTE_CONTENT)) {
+
+			// we are under the note-content tag
+			// we will append all its nested tags so I create a string builder to do that
+			inNoteContentTag = true;
+		}
+
+		// if we are in note-content, keep and convert formatting tags
+		// TODO is XML CaSe SeNsItIve? if not change equals to equalsIgnoreCase and apply to endElement()
+		if (inNoteContentTag) {
+			if (name.equals(BOLD)) {
+				inBoldTag = true;
+			} else if (name.equals(ITALIC)) {
+				inItalicTag = true;
+			} else if (name.equals(STRIKETHROUGH)) {
+				inStrikeTag = true;
+			} else if (name.equals(HIGHLIGHT)) {
+				inHighlighTag = true;
+			} else if (name.equals(MONOSPACE)) {
+				inMonospaceTag = true;
+			} else if (name.equals(SMALL)) {
+				inSizeSmallTag = true;
+			} else if (name.equals(LARGE)) {
+				inSizeLargeTag = true;
+			} else if (name.equals(HUGE)) {
+				inSizeHugeTag = true;
+			} else if (name.equals(LIST)) {
+				inListLevel++;
+			} else if (name.equals(LIST_ITEM)) {
+				inListItem = true;
+			}
+		}
+
+	}
+
+	@Override
+	public void endElement(String uri, String localName, String name)
+			throws SAXException {
+
+		if (name.equals(NOTE_CONTENT)) {
+			inNoteContentTag = false;
+		}
+		
+		// if we are in note-content, keep and convert formatting tags
+		if (inNoteContentTag) {
+			if (name.equals(BOLD)) {
+				inBoldTag = false;
+			} else if (name.equals(ITALIC)) {
+				inItalicTag = false;
+			} else if (name.equals(STRIKETHROUGH)) {
+				inStrikeTag = false;
+			} else if (name.equals(HIGHLIGHT)) {
+				inHighlighTag = false;
+			} else if (name.equals(MONOSPACE)) {
+				inMonospaceTag = false;
+			} else if (name.equals(SMALL)) {
+				inSizeSmallTag = false;
+			} else if (name.equals(LARGE)) {
+				inSizeLargeTag = false;
+			} else if (name.equals(HUGE)) {
+				inSizeHugeTag = false;
+			} else if (name.equals(LIST)) {
+				inListLevel--;
+			} else if (name.equals(LIST_ITEM)) {
+				inListItem = false;
+			}
+		}
+	}
+
+	@Override
+	public void characters(char[] ch, int start, int length)
+			throws SAXException {
+		
+		String currentString = new String(ch, start, length);
+
+		if (inNoteContentTag) {
+			// while we are in note-content, append
+			ssb.append(currentString, start, length);
+			int strLenStart = ssb.length()-length;
+			int strLenEnd = ssb.length();
+			
+			// apply style if required
+			// TODO I haven't tested nested tags yet
+			if (inBoldTag) {
+				ssb.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			}
+			if (inItalicTag) {
+				ssb.setSpan(new StyleSpan(android.graphics.Typeface.ITALIC), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			}
+			if (inStrikeTag) {
+				ssb.setSpan(new StrikethroughSpan(), strLenStart, ssb.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			}
+			if (inHighlighTag) {
+				ssb.setSpan(new BackgroundColorSpan(Note.NOTE_HIGHLIGHT_COLOR), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			}
+			if (inMonospaceTag) {
+				ssb.setSpan(new TypefaceSpan(Note.NOTE_MONOSPACE_TYPEFACE), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			}
+			if (inSizeSmallTag) {
+				ssb.setSpan(new RelativeSizeSpan(Note.NOTE_SIZE_SMALL_FACTOR), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			}
+			if (inSizeLargeTag) {
+				ssb.setSpan(new RelativeSizeSpan(Note.NOTE_SIZE_LARGE_FACTOR), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			}
+			if (inSizeHugeTag) {
+				ssb.setSpan(new RelativeSizeSpan(Note.NOTE_SIZE_HUGE_FACTOR), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			}
+			if (inListItem) {
+				// TODO new sexier bullets?
+				// Show a leading margin that is as wide as the nested level we are in
+				ssb.setSpan(new LeadingMarginSpan.Standard(10*inListLevel), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+				ssb.setSpan(new BulletSpan(), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			}
+		}
+	}
+}

=== modified file 'src/org/tomdroid/xml/NoteHandler.java'
--- src/org/tomdroid/xml/NoteHandler.java	2009-06-21 21:59:41 +0000
+++ src/org/tomdroid/xml/NoteHandler.java	2010-01-17 18:10:19 +0000
@@ -3,7 +3,7 @@
  * Tomboy on Android
  * http://www.launchpad.net/tomdroid
  * 
- * Copyright 2008 Olivier Bilodeau <[e-mail]>
+ * Copyright 2008, 2009, 2010 Olivier Bilodeau <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -22,169 +22,51 @@
  */
 package org.tomdroid.xml;
 
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
 import org.tomdroid.Note;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.style.BackgroundColorSpan;
-import android.text.style.BulletSpan;
-import android.text.style.LeadingMarginSpan;
-import android.text.style.RelativeSizeSpan;
-import android.text.style.StrikethroughSpan;
-import android.text.style.StyleSpan;
-import android.text.style.TypefaceSpan;
-
-/*
- * I don't know if I'm doing the right thing but I think that giving this class
- * the responsibility of filling the note is something quite cohesive and hope 
- * the coupling involved won't do much damage. I guess time will tell.
- */
 public class NoteHandler extends DefaultHandler {
 	
 	// position keepers
 	private boolean inTitleTag = false;
 	private boolean inLastChangeDateTag = false;
-	private boolean inNoteTag = false;
-	private boolean inTextTag = false;
-	private boolean inNoteContentTag = false;
-	private boolean inNoteContentTagMustGrabTitle = true; // hack to grab title and make it big
-	private boolean inBoldTag = false;
-	private boolean inItalicTag = false;
-	private boolean inStrikeTag = false;
-	private boolean inHighlighTag = false;
-	private boolean inMonospaceTag = false;
-	private boolean inSizeSmallTag = false;
-	private boolean inSizeLargeTag = false;
-	private boolean inSizeHugeTag = false;
-	private int inListLevel = 0;
-	private boolean inListItem = false;
 	
 	// -- Tomboy's notes XML tags names --
 	// Metadata related
 	private final static String TITLE = "title";
 	private final static String LAST_CHANGE_DATE = "last-change-date"; 
-	// Style related
-	private final static String NOTE_CONTENT = "note-content";
-	private final static String BOLD = "bold";
-	private final static String ITALIC = "italic";
-	private final static String STRIKETHROUGH = "strikethrough";
-	private final static String HIGHLIGHT = "highlight";
-	private final static String MONOSPACE = "monospace";
-	// Sizes are using a namespace identifier size. Ex: <size:small></size:small>
-	private final static String NS_SIZE = "http://beatniksoftware.com/tomboy/size";
-	private final static String SMALL = "small";
-	private final static String LARGE = "large";
-	private final static String HUGE = "huge";
-	// Bullet list-related
-	private final static String LIST = "list";
-	private final static String LIST_ITEM = "list-item";
-	
-	// accumulate notecontent is this var since it spans multiple xml tags
-	private SpannableStringBuilder ssb;
 	
 	// link to model 
 	private Note note;
 	
 	public NoteHandler(Note note) {
 		this.note = note;
-		
-		// we will use the SpannableStringBuilder from the note
-		this.ssb = note.getNoteContent();
 	}
 	
 	@Override
 	public void startElement(String uri, String localName, String name,	Attributes attributes) throws SAXException {
 		
-		// TODO validate top-level tag for tomboy notes and throw exception if its the wrong version number (maybe offer to parse also?)
-		
-		if (localName.equals(NOTE_CONTENT)) {
+		// TODO validate top-level tag for tomboy notes and throw exception if its the wrong version number (maybe offer to parse also?)		
 
-			// we are under the note-content tag
-			// we will append all its nested tags so I create a string builder to do that
-			inNoteContentTag = true;
-		} else if (localName.equals(TITLE)) {
+		if (localName.equals(TITLE)) {
 			inTitleTag = true;
 		} else if (localName.equals(LAST_CHANGE_DATE)) {
 			inLastChangeDateTag = true;
 		}
 
-		// if we are in note-content, keep and convert formatting tags
-		// TODO is XML CaSe SeNsItIve? if not change equals to equalsIgnoreCase and apply to endElement()
-		if (inNoteContentTag) {
-			if (localName.equals(BOLD)) {
-				inBoldTag = true;
-			} else if (localName.equals(ITALIC)) {
-				inItalicTag = true;
-			} else if (localName.equals(STRIKETHROUGH)) {
-				inStrikeTag = true;
-			} else if (localName.equals(HIGHLIGHT)) {
-				inHighlighTag = true;
-			} else if (localName.equals(MONOSPACE)) {
-				inMonospaceTag = true;
-			} else if (uri.equals(NS_SIZE)) {
-				// now check for the different possible sizes
-				if (localName.equals(SMALL)) {
-					inSizeSmallTag = true;
-				} else if (localName.equals(LARGE)) {
-					inSizeLargeTag = true;
-				} else if (localName.equals(HUGE)) {
-					inSizeHugeTag = true;
-				}
-			} else if (localName.equals(LIST)) {
-				inListLevel++;
-			} else if (localName.equals(LIST_ITEM)) {
-				inListItem = true;
-			}
-		}
-
 	}
 
 	@Override
 	public void endElement(String uri, String localName, String name)
 			throws SAXException {
 
-		if (localName.equals(NOTE_CONTENT)) {
-			
-			// note-content is over, we can set the builded note to Note's noteContent
-			inNoteContentTag = false;
-		} else if (localName.equals(TITLE)) {
+		if (localName.equals(TITLE)) {
 			inTitleTag = false;
 		} else if (localName.equals(LAST_CHANGE_DATE)) {
 			inLastChangeDateTag = false;
 		}
-		
-		// if we are in note-content, keep and convert formatting tags
-		if (inNoteContentTag) {
-			if (localName.equals(BOLD)) {
-				inBoldTag = false;
-			} else if (localName.equals(ITALIC)) {
-				inItalicTag = false;
-			} else if (localName.equals(STRIKETHROUGH)) {
-				inStrikeTag = false;
-			} else if (localName.equals(HIGHLIGHT)) {
-				inHighlighTag = false;
-			} else if (localName.equals(MONOSPACE)) {
-				inMonospaceTag = false;
-			} else if (uri.equals(NS_SIZE)) {
-				// now check for the different possible sizes
-				if (localName.equals(SMALL)) {
-					inSizeSmallTag = false;
-				} else if (localName.equals(LARGE)) {
-					inSizeLargeTag = false;
-				} else if (localName.equals(HUGE)) {
-					inSizeHugeTag = false;
-				} 
-			} else if (localName.equals(LIST)) {
-				inListLevel--;
-			} else if (localName.equals(LIST_ITEM)) {
-				inListItem = false;
-			}
-		}
 	}
 
 	// FIXME we'll have to think about how we handle the title soon.. IMHO there's a problem with duplicating the data from the <title> tag and also putting it straight into the note.. this will have to be reported to tomboy 
@@ -202,52 +84,5 @@
 //			DateTimeFormatter fmt = ISODateTimeFormat.dateTime();
 //			note.setLastChangeDate(fmt.parseDateTime(currentString));
 		}
-
-		if (inNoteContentTag) {
-			// while we are in note-content, append
-			ssb.append(currentString, start, length);
-			int strLenStart = ssb.length()-length;
-			int strLenEnd = ssb.length();
-			
-			// the first line of the note-content tag is the note's title. It must be big like in tomboy.
-			// TODO tomboy's fileformat suggestion: title should not be repeated in the note-content. This is ugly IMHO
-			if (inNoteContentTagMustGrabTitle) {
-				ssb.setSpan(new RelativeSizeSpan(Note.NOTE_SIZE_HUGE_FACTOR), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-				inNoteContentTagMustGrabTitle = false;
-			}
-			
-			// apply style if required
-			// TODO I haven't tested nested tags yet
-			if (inBoldTag) {
-				ssb.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-			}
-			if (inItalicTag) {
-				ssb.setSpan(new StyleSpan(android.graphics.Typeface.ITALIC), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-			}
-			if (inStrikeTag) {
-				ssb.setSpan(new StrikethroughSpan(), strLenStart, ssb.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-			}
-			if (inHighlighTag) {
-				ssb.setSpan(new BackgroundColorSpan(Note.NOTE_HIGHLIGHT_COLOR), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-			}
-			if (inMonospaceTag) {
-				ssb.setSpan(new TypefaceSpan(Note.NOTE_MONOSPACE_TYPEFACE), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-			}
-			if (inSizeSmallTag) {
-				ssb.setSpan(new RelativeSizeSpan(Note.NOTE_SIZE_SMALL_FACTOR), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-			}
-			if (inSizeLargeTag) {
-				ssb.setSpan(new RelativeSizeSpan(Note.NOTE_SIZE_LARGE_FACTOR), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-			}
-			if (inSizeHugeTag) {
-				ssb.setSpan(new RelativeSizeSpan(Note.NOTE_SIZE_HUGE_FACTOR), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-			}
-			if (inListItem) {
-				// TODO new sexier bullets?
-				// Show a leading margin that is as wide as the nested level we are in
-				ssb.setSpan(new LeadingMarginSpan.Standard(10*inListLevel), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-				ssb.setSpan(new BulletSpan(), strLenStart, strLenEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-			}
-		}
 	}
 }