Merge lp:~vbkaisetsu/tomdroid/sql-args into lp:~tomdroid-maintainers/tomdroid/main

[Koichi Akabe]

This branch fixes following things:
    - Bug #562089: the search-bar search also XML tags Remove
    - Bug #880322: SQL query should use "?" and selectionArgs Remove
    - The list always shows system:template notes
    - Can't search words which contains "%" or "_"

New features:
    - Added notebook argument to NoteManager.getListAdapter() function

Please see it.

Regards,
Koichi Akabe

[Piotr Adamski (mcveat)]

Please consider using StringBuilder for constructing where clause and wrapping it in separate function to increase readability and divide responsibilities a bit.

[lp:~vbkaisetsu/tomdroid/sql-args]

256. By Koichi Akabe on 2011-10-28

changed to use StringBuilder

[Koichi Akabe (vbkaisetsu)]

Hello Piotr,

Thanks your opinion.
I changed the code to use StringBuilder.

Regards,
Koichi Akabe.

[Piotr Adamski (mcveat)]

Great, Koichi! But your fix needs one more change in my opinion. The point of using StringBuilder is to avoid explicit string concatenation, as each produces new String in strings pool. It may strike back as memory issue, so it is worth to avoid them in cases like this, where there is a lot string operations. Consider replacing each concatenation with append method call. I know it doesn't look so concise, but in that situation i think it is worth it.

Regards
Piotr

[Koichi Akabe (vbkaisetsu)]

I think constants' normal operation is faster than using StringBuffer.
Because they are calculated in compiling.

Note.XXXXXs are defined with final, so they are constant.

[lp:~vbkaisetsu/tomdroid/sql-args]

257. By Koichi Akabe on 2011-10-29

added NOTE_CONTENT_PLAIN to restore plain text contents
changed to search NOTE_CONTENT_PLAIN

[Koichi Akabe (vbkaisetsu)]

The commit message is wrong: s/restore/store/

Sorry.

[lp:~vbkaisetsu/tomdroid/sql-args]

258. By Koichi Akabe on 2011-10-29

added some html escape codes

259. By Koichi Akabe on 2011-10-29

changed to use android.text.Html

260. By Koichi Akabe on 2011-10-30

changed SQL query to ignore templates

[Stefan Hammer (j-4-deactivatedaccount)]

Hi! The bug where searching for tags shows all notes is finally gone - great!
But somehow, the test notebook templates still show up in the notes list and in the search on my AVDevices. (even after complete reinstall.)
Do you have any idea?

[Koichi Akabe (vbkaisetsu)]

In my environment, templates have "system:template" tag and they are not shown on the list.
Please debug it and tell me more information.

[Stefan Hammer (j-4-deactivatedaccount)]

Hi! I use Android 1.6 AVD, the sdcard image (sdcard.img) from our sources and exactly your code branch, with additional log entries. I still have both two test notebook templates in the list.

In this templates the tags look like:
  <tags>

    <tag>system:template</tag>

    <tag>system:notebook:test</tag>

  </tags>

  <tags>
    <tag>system:notebook:Hipo</tag>
    <tag>system:template</tag>
  </tags>

My log gives:
10-30 11:04:27.107: I/Tomdroid(486): Tomdroid is first run.
10-30 11:04:27.227: V/FirstNote(486): Creating first note
10-30 11:04:27.537: V/NoteManager(486): A new note has been detected (not yet in db)
10-30 11:04:27.547: V/NoteManager(486): Note inserted in content provider. ID: content://org.tomdroid.notes/notes/1 TITLE:Tomdroid's first note GUID:8f837a99-c920-4501-b303-6a39af57a714
10-30 11:04:27.626: V/NoteManager(486): where is: tags NOT LIKE '%system:template%'
10-30 11:04:27.626: V/NoteManager(486): TAGS is: tags
10-30 11:04:52.287: V/FirstNote(486): Creating first note
10-30 11:04:52.556: V/NoteManager(486): A new note has been detected (not yet in db)
10-30 11:04:52.566: V/NoteManager(486): Note inserted in content provider. ID: content://org.tomdroid.notes/notes/1 TITLE:Tomdroid's first note GUID:8f837a99-c920-4501-b303-6a39af57a714
10-30 11:04:55.497: V/SdCardSyncService(486): Loading local notes
10-30 11:04:55.497: I/SdCardSyncService(486): Path /sdcard/tomdroid exists: true

It works when syncing the AVD with Ubuntu One, using my own notes. One difference is, that there i do not use notebooks.
So, the tags look like:

  <tags>
    <tag>system:template</tag>
  </tags>

10-30 11:34:44.367: V/FirstNote(652): Creating first note
10-30 11:34:44.786: V/NoteManager(652): A new note has been detected (not yet in db)
10-30 11:34:44.797: V/NoteManager(652): Note inserted in content provider. ID: content://org.tomdroid.notes/notes/1 TITLE:Tomdroid's first note GUID:8f837a99-c920-4501-b303-6a39af57a714
10-30 11:35:30.927: V/NoteManager(652): where is: tags NOT LIKE '%system:template%'
10-30 11:35:30.927: V/NoteManager(652): query is: null

Does this help?

[Koichi Akabe (vbkaisetsu)]

Notes list always shows templates on SD card, because Tomdroid doesn't check "tags" tag.

I registered another branch to solve it.
https://code.launchpad.net/~vbkaisetsu/tomdroid/sdcard-tags

Thanks for reporting!

[lp:~vbkaisetsu/tomdroid/sql-args]

261. By Koichi Akabe on 2011-10-30

marged sdcard-tags branch

[Stefan Hammer (j-4-deactivatedaccount)]

Thanks for your work. I already know the code very well and I think it's awesome. This is something we definitively have to include in the next release.
The new sql query system is much simpler/smarter and that notebook templates are in the database, but not shown - just as it should be ;-)

Problem is... I have never merged any important code and I am not sure, what Olivier's reviewing checklist/merging criteria contains. Therefore I suggest to wait for his opinion. If he is fine with it, I will merge immediately.

There was a idea coming up, when testing this stuff: We now store all tags, including the "system:notebook:****" tag. If you include Note.TAGS in the search query, it would be very easy to display all notes of one notebooks, just with the query "notebook:mynotebookname". Of course, we would have to think about a way to exclude queries like notebook, system or template from searching in Note.TAGS... But hey, intelligent searching! Further... how about title:mynotetitle?? :-D ... but this would be something for a new project, if you feel like it!

[Koichi Akabe (vbkaisetsu)]

Hello Stefan,

It's wonderful but there are many problems for notebooks.
We have to register another branch to solve them.

[lp:~vbkaisetsu/tomdroid/sql-args]

262. By Koichi Akabe on 2011-10-31

added notebook support

[Koichi Akabe (vbkaisetsu)]

I added notebook support to getListAdapter(), and you can search "%" and "_" now.
This code encodes some symbols of notes before store them.

I think this code is dirty. Please review it.

[lp:~vbkaisetsu/tomdroid/sql-args]

263. By Koichi Akabe on 2011-11-01

fixed wrong sql

[Olivier Bilodeau (plaxx)]

Doesn't automatically upgrade the SQL database. This can't be merged as-is.

Also, I would like to see the query arguments to be migrated into ? and selectionArgs as query() supports. docs/reference/android/database/sqlite/SQLiteDatabase.html#query(java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String)

review: Needs Fixing

[lp:~vbkaisetsu/tomdroid/sql-args]

264. By Koichi Akabe on 2012-04-01

merge with trunk to solve conflicts

265. By Koichi Akabe on 2012-04-01

change database version to 4 and support to update database from ver.2 or later

[Koichi Akabe (vbkaisetsu)]

changed onUpgrade to support update from old versions 2 or 3. But version 1 dosn't have GUID and note contents (title only) so it doesn't support.

[Olivier Bilodeau (plaxx)]

w/o looking at the code, I would say not upgrading from 1 is ok.

What I'm really concerned about is the 0.4.1 users on the android market. I want them to upgrade cleanly. Pretty sure this fixes it.

[Stefan Hammer (j-4-deactivatedaccount)]

Hi!

Since our new beta, a lot of things changed. However, we still need to fix parts of the things treated in this branch.
    - Bug #562089: the search-bar search also XML tags Remove
    - Bug #880322: SQL query should use "?" and selectionArgs Remove
    - Can't search words which contains "%" or "_"

All the other features are already implemented (i think)
As I assume that this branch won't merge with the new beta it is probably best to rewrite these things too (or copy/paste the neccesary stuff into the new beta code).

@Koichi: do you want to fix this three issues in a new branch, or do you prefere if somebody else does it?

[Koichi Akabe (vbkaisetsu)]

I hope to fix this branch, but the other hand, it's hard work.
I'll appreciate someone's help.

Unmerged revisions

265. By Koichi Akabe on 2012-04-01

change database version to 4 and support to update database from ver.2 or later

264. By Koichi Akabe on 2012-04-01

merge with trunk to solve conflicts

263. By Koichi Akabe on 2011-11-01

fixed wrong sql

262. By Koichi Akabe on 2011-10-31

added notebook support

261. By Koichi Akabe on 2011-10-30

marged sdcard-tags branch

260. By Koichi Akabe on 2011-10-30

changed SQL query to ignore templates

259. By Koichi Akabe on 2011-10-29

changed to use android.text.Html

258. By Koichi Akabe on 2011-10-29

added some html escape codes

257. By Koichi Akabe on 2011-10-29

added NOTE_CONTENT_PLAIN to restore plain text contents
changed to search NOTE_CONTENT_PLAIN

256. By Koichi Akabe on 2011-10-28

changed to use StringBuilder

=== modified file 'src/org/tomdroid/Note.java'
--- src/org/tomdroid/Note.java	2011-10-27 16:33:12 +0000
+++ src/org/tomdroid/Note.java	2012-04-01 04:35:23 +0000
@@ -30,6 +30,7 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.tomdroid.util.NoteContentBuilder;
+import org.tomdroid.util.StringConverter;
 import org.tomdroid.util.TLog;
 import org.tomdroid.util.XmlUtils;
 
@@ -47,6 +48,7 @@
 	public static final String FILE = "file";
 	public static final String TAGS = "tags";
 	public static final String NOTE_CONTENT = "content";
+	public static final String NOTE_CONTENT_PLAIN = "content_plain";
 	
 	// Logging info
 	private static final String TAG = "Note";
@@ -95,7 +97,7 @@
 		tags = new String();
 		if (jtags != null) {
 			for (int i = 0; i < jtags.length(); i++ ) {
-				tag = jtags.optString(i);
+				tag = StringConverter.encode(jtags.optString(i));
 				tags += tag + ",";
 			}
 		}
@@ -104,6 +106,10 @@
 	public String getTags() {
 		return tags;
 	}
+	
+	public void setTags(String tags) {
+		this.tags = tags;
+	}
 
 	public String getUrl() {
 		return url;

=== modified file 'src/org/tomdroid/NoteManager.java'
--- src/org/tomdroid/NoteManager.java	2011-10-27 16:33:12 +0000
+++ src/org/tomdroid/NoteManager.java	2012-04-01 04:35:23 +0000
@@ -24,11 +24,22 @@
  */
 package org.tomdroid;
 
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.NoteListCursorAdapter;
+import org.tomdroid.util.StringConverter;
+import org.tomdroid.util.XmlUtils;
+
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
+import android.text.Html;
+import android.util.Log;
 import android.widget.ListAdapter;
 import org.tomdroid.ui.Tomdroid;
 import org.tomdroid.util.NoteListCursorAdapter;
@@ -92,6 +103,9 @@
                 null);
 		activity.startManagingCursor(managedCursor);
 		
+		String xmlContent = note.getXmlContent();
+		String plainContent = StringConverter.encode(Html.fromHtml(xmlContent).toString());
+		
 		// Preparing the values to be either inserted or updated
 		// depending on the result of the previous query
 		ContentValues values = new ContentValues();
@@ -100,7 +114,8 @@
 		values.put(Note.GUID, note.getGuid().toString());
 		// Notice that we store the date in UTC because sqlite doesn't handle RFC3339 timezone information
 		values.put(Note.MODIFIED_DATE, note.getLastChangeDate().format3339(false));
-		values.put(Note.NOTE_CONTENT, note.getXmlContent());
+		values.put(Note.NOTE_CONTENT, xmlContent);
+		values.put(Note.NOTE_CONTENT_PLAIN, plainContent);
 		values.put(Note.TAGS, note.getTags());
 		
 		if (managedCursor.getCount() == 0) {
@@ -148,26 +163,33 @@
 	}
 	
 
-	public static ListAdapter getListAdapter(Activity activity, String querys) {
-		
-		String where;
-		if (querys==null) {
-			where=null;
-		} else {
+	public static ListAdapter getListAdapter(Activity activity, String querys, String notebook) {
+		
+		StringBuilder where = new StringBuilder();
+		ArrayList<String> qargs = new ArrayList<String>();
+		
+		where.append(Note.TAGS + " NOT LIKE 'system:template%' AND " + Note.TAGS + " NOT LIKE '%,system:template%'");
+		
+		if(notebook != null) {
+			// sql statements to specify notebook
+			String encodedNotebook = StringConverter.encodeForTag(notebook);
+			where.append(" AND ("+Note.TAGS+" LIKE ? OR "+Note.TAGS+" LIKE ?)");
+			qargs.add("%,system:notebook:"+encodedNotebook+",%");
+			qargs.add("system:notebook:"+encodedNotebook+",%");
+		}
+				
+		if (querys!=null) {
 			// sql statements to search notes
 			String[] query = querys.split(" ");
-			where="";
-			int count=0;
 			for (String string : query) {
-				if (count>0) where = where + " AND ";
-				where = where + "("+Note.TITLE+" LIKE '%"+string+"%' OR "+Note.NOTE_CONTENT+" LIKE '%"+string+"%')";
-				count++;
+				qargs.add("%"+StringConverter.encode(string)+"%");
+				where.append(" AND "+Note.TITLE+" || "+Note.NOTE_CONTENT_PLAIN+" LIKE ?");
 			}	
 		}
 
 		// get a cursor representing all notes from the NoteProvider
 		Uri notes = Tomdroid.CONTENT_URI;
-		Cursor notesCursor = activity.managedQuery(notes, LIST_PROJECTION, where, null, null);
+		Cursor notesCursor = activity.managedQuery(notes, LIST_PROJECTION, where.toString(), qargs.toArray(new String[qargs.size()]), null);
 		
 		// set up an adapter binding the TITLE field of the cursor to the list item
 		String[] from = new String[] { Note.TITLE };
@@ -175,9 +197,14 @@
 		return new NoteListCursorAdapter(activity, R.layout.main_list_item, notesCursor, from, to);
 	}
 	
+	public static ListAdapter getListAdapter(Activity activity, String querys) {
+		
+		return getListAdapter(activity, querys, null);
+	}
+	
 	public static ListAdapter getListAdapter(Activity activity) {
 		
-		return getListAdapter(activity, null);
+		return getListAdapter(activity, null, null);
 	}
 
 	// gets the titles of the notes present in the db, used in ViewNote.buildLinkifyPattern()
@@ -236,3 +263,4 @@
 		return xmlContent;
 	}
 }
+

=== modified file 'src/org/tomdroid/NoteProvider.java'
--- src/org/tomdroid/NoteProvider.java	2011-10-27 16:33:12 +0000
+++ src/org/tomdroid/NoteProvider.java	2012-04-01 04:35:23 +0000
@@ -51,22 +51,26 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
+import android.text.Html;
 import android.text.TextUtils;
 import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.StringConverter;
 import org.tomdroid.util.TLog;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 public class NoteProvider extends ContentProvider {
-	
-	// ContentProvider stuff
-	// --	
-	private static final String DATABASE_NAME = "tomdroid-notes.db";
-	private static final String DB_TABLE_NOTES = "notes";
-	private static final int DB_VERSION = 3;
-	private static final String DEFAULT_SORT_ORDER = Note.MODIFIED_DATE + " DESC";
-	
+    
+    // ContentProvider stuff
+    // --    
+    private static final String DATABASE_NAME = "tomdroid-notes.db";
+    private static final String DB_TABLE_NOTES = "notes";
+    private static final int DB_VERSION = 4;
+    private static final String DEFAULT_SORT_ORDER = Note.MODIFIED_DATE + " DESC";
+    
     private static HashMap<String, String> notesProjectionMap;
 
     private static final int NOTES = 1;
@@ -77,6 +81,14 @@
     
     // Logging info
     private static final String TAG = "NoteProvider";
+    
+    // List of each version's columns
+    private static final String[][] COLUMNS_VERSION = {
+        { Note.TITLE, Note.FILE, Note.MODIFIED_DATE },
+        { Note.GUID, Note.TITLE, Note.FILE, Note.NOTE_CONTENT, Note.MODIFIED_DATE },
+        { Note.GUID, Note.TITLE, Note.FILE, Note.NOTE_CONTENT, Note.MODIFIED_DATE, Note.TAGS },
+        { Note.GUID, Note.TITLE, Note.FILE, Note.NOTE_CONTENT, Note.NOTE_CONTENT_PLAIN, Note.MODIFIED_DATE, Note.TAGS }
+    };
 
     /**
      * This class helps open, create, and upgrade the database file.
@@ -89,12 +101,13 @@
 
         @Override
         public void onCreate(SQLiteDatabase db) {
-            db.execSQL("CREATE TABLE " + DB_TABLE_NOTES	 + " ("
+            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.NOTE_CONTENT_PLAIN + " TEXT,"
                     + Note.MODIFIED_DATE + " STRING,"
                     + Note.TAGS + " STRING"
                     + ");");
@@ -102,10 +115,51 @@
 
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        	TLog.d(TAG, "Upgrading database from version {0} to {1}, which will destroy all old data",
-                    oldVersion, newVersion);
+            TLog.d(TAG, "Upgrading database from version {0} to {1}", oldVersion, newVersion);
+
+            Cursor notesCursor;
+            ArrayList<Map<String, String>> db_list = new ArrayList<Map<String, String>>();
+            notesCursor = db.query(DB_TABLE_NOTES, COLUMNS_VERSION[oldVersion - 1], null, null, null, null, null);
+            notesCursor.moveToFirst();
+
+            if (oldVersion == 1) {
+            	// GUID and NOTE_CONTENT are not saved.
+                TLog.d(TAG, "Database version {0} is not supported to update, all old datas will be destroyed", oldVersion);
+                db.execSQL("DROP TABLE IF EXISTS notes");
+                onCreate(db);
+                return;
+            }
+
+            // Get old datas from the SQL
+            while(!notesCursor.isAfterLast()) {
+                Map<String, String> row = new HashMap<String, String>();
+                for(int i = 0; i < COLUMNS_VERSION[oldVersion - 1].length; i++) {
+                    row.put(COLUMNS_VERSION[oldVersion - 1][i], notesCursor.getString(i));
+                }
+
+                // create new columns
+                if (oldVersion <= 2) {
+                    row.put(Note.TAGS, "");
+                }
+                if (oldVersion <= 3) {
+                    row.put(Note.NOTE_CONTENT_PLAIN, StringConverter.encode(Html.fromHtml(row.get(Note.NOTE_CONTENT)).toString()));
+                }
+
+                db_list.add(row);
+                notesCursor.moveToNext();
+            }
+
             db.execSQL("DROP TABLE IF EXISTS notes");
             onCreate(db);
+
+            // put rows to the database
+            ContentValues row = new ContentValues();
+            for(int i = 0; i < db_list.size(); i++) {
+                for(int j = 0; j < COLUMNS_VERSION[newVersion - 1].length; j++) {
+                    row.put(COLUMNS_VERSION[newVersion - 1][j], db_list.get(i).get(COLUMNS_VERSION[newVersion - 1][j]));
+                }
+                db.insert(DB_TABLE_NOTES, null, row);
+            }
         }
     }
 
@@ -135,11 +189,11 @@
             break;
             
         case NOTE_TITLE:
-        	qb.setTables(DB_TABLE_NOTES);
-        	qb.setProjectionMap(notesProjectionMap);
-        	// TODO appendWhere + whereArgs instead (new String[] whereArgs = uri.getLas..)?
-        	qb.appendWhere(Note.TITLE + " LIKE '" + uri.getLastPathSegment()+"'");
-        	break;
+            qb.setTables(DB_TABLE_NOTES);
+            qb.setProjectionMap(notesProjectionMap);
+            // TODO appendWhere + whereArgs instead (new String[] whereArgs = uri.getLas..)?
+            qb.appendWhere(Note.TITLE + " LIKE '" + uri.getLastPathSegment()+"'");
+            break;
 
         default:
             throw new IllegalArgumentException("Unknown URI " + uri);
@@ -173,7 +227,7 @@
             return Tomdroid.CONTENT_ITEM_TYPE;
             
         case NOTE_TITLE:
-        	return Tomdroid.CONTENT_ITEM_TYPE;
+            return Tomdroid.CONTENT_ITEM_TYPE;
 
         default:
             throw new IllegalArgumentException("Unknown URI " + uri);
@@ -205,7 +259,7 @@
         
         // 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());
+            values.put(Note.GUID, UUID.randomUUID().toString());
         }
 
         // TODO does this make sense?
@@ -291,6 +345,7 @@
         notesProjectionMap.put(Note.TITLE, Note.TITLE);
         notesProjectionMap.put(Note.FILE, Note.FILE);
         notesProjectionMap.put(Note.NOTE_CONTENT, Note.NOTE_CONTENT);
+        notesProjectionMap.put(Note.NOTE_CONTENT_PLAIN, Note.NOTE_CONTENT_PLAIN);
         notesProjectionMap.put(Note.TAGS, Note.TAGS);
         notesProjectionMap.put(Note.MODIFIED_DATE, Note.MODIFIED_DATE);
     }

=== modified file 'src/org/tomdroid/sync/sd/NoteHandler.java'
--- src/org/tomdroid/sync/sd/NoteHandler.java	2011-09-05 15:05:46 +0000
+++ src/org/tomdroid/sync/sd/NoteHandler.java	2012-04-01 04:35:23 +0000
@@ -24,6 +24,7 @@
 package org.tomdroid.sync.sd;
 
 import org.tomdroid.Note;
+import org.tomdroid.util.StringConverter;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -35,15 +36,20 @@
 	// position keepers
 	private boolean inTitleTag = false;
 	private boolean inLastChangeDateTag = false;
+	private boolean inTagTag = 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";
+	private final static String TAGS = "tags";
+	private final static String TAG = "tag";
 	
 	// Buffers for parsed elements
 	private StringBuilder title = new StringBuilder();
 	private StringBuilder lastChangeDate = new StringBuilder();
+	private StringBuilder tags = new StringBuilder();
+	private StringBuilder tag;
 	
 	// link to model 
 	private Note note;
@@ -61,6 +67,9 @@
 			inTitleTag = true;
 		} else if (localName.equals(LAST_CHANGE_DATE)) {
 			inLastChangeDateTag = true;
+		} else if (localName.equals(TAG)) {
+			inTagTag = true;
+			tag = new StringBuilder();
 		}
 
 	}
@@ -75,6 +84,12 @@
 		} else if (localName.equals(LAST_CHANGE_DATE)) {
 			inLastChangeDateTag = false;
 			note.setLastChangeDate(lastChangeDate.toString());
+		} else if (localName.equals(TAGS)) {
+			note.setTags(tags.toString());
+		} else if (localName.equals(TAG)) {
+			inTagTag = false;
+			tags.append(StringConverter.encodeForTag(tag.toString()));
+			tags.append(",");
 		}
 	}
 
@@ -86,6 +101,8 @@
 			title.append(ch, start, length);
 		} else if (inLastChangeDateTag) {
 			lastChangeDate.append(ch, start, length);
+		} else if (inTagTag) {
+			tag.append(ch, start, length);
 		}
 	}
 }

=== added file 'src/org/tomdroid/util/StringConverter.java'
--- src/org/tomdroid/util/StringConverter.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/util/StringConverter.java	2012-04-01 04:35:23 +0000
@@ -0,0 +1,51 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2011 Koichi Akabe <[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.util;
+
+public class StringConverter {
+	public static String encode(String text) {
+		return text.replace("&", "&amp;")
+		           .replace("%", "&pct;")
+		           .replace("_", "&und;");
+	}
+	
+	public static String decode(String text) {
+		return text.replace("&und;", "_")
+		           .replace("&pct;", "%")
+		           .replace("&amp;", "&");
+	}
+	
+	public static String encodeForTag(String text) {
+		return text.replace("&", "&amp;")
+		           .replace("%", "&pct;")
+		           .replace(",", "&com;")
+		           .replace("_", "&und;");
+	}
+	
+	public static String decodeForTag(String text) {
+		return text.replace("&und;", "_")
+		           .replace("&com;", ",")
+		           .replace("&pct;", "%")
+		           .replace("&amp;", "&");
+	}
+}