lp:~plaxx/tomdroid/storage-redesign

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~benoit.garret/tomdroid/storage-redesign at revision 164

Benoit Garret: Approve on 2010-01-17

Olivier Bilodeau (community): Approve on 2010-01-10

Diff: 873 lines (+217/-226)

9 files modified

src/org/tomdroid/Note.java (+6/-3)
src/org/tomdroid/NoteManager.java (+33/-20)
src/org/tomdroid/ui/Tomdroid.java (+18/-19)
src/org/tomdroid/ui/ViewNote.java (+55/-7)
src/org/tomdroid/util/AsyncNoteLoaderAndParser.java (+57/-15)
src/org/tomdroid/util/NoteContentBuilder.java (+12/-23)
src/org/tomdroid/util/XmlUtils.java (+0/-36)
src/org/tomdroid/xml/NoteContentHandler.java (+32/-40)
src/org/tomdroid/xml/NoteHandler.java (+4/-63)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

170. By Olivier Bilodeau on 2010-01-16

Removed the init phase of the NoteManager singleton to avoid problems with managed cursors.
Now every call to NoteManager provides an activity reference to use the cursor in the current active activity's context.

169. By Olivier Bilodeau on 2010-01-15

Misc cleanup
- NoteManager's constructor no longer public (to prevent bypassing getInstance())
- Added comments
- Moved stuff around (static first)

168. By Olivier Bilodeau on 2010-01-10

little changes for a cleaner merge

167. By Olivier Bilodeau on 2010-01-09

Now using a regexp to fetch note-content and keeping note-content tag in database.
Instead of using the hack while xml parsing to re-create xml tags, I prefered to just grab out the note-content section using a regexp.

166. By Olivier Bilodeau on 2010-01-09

Using SAX's namespace features to allow parsing of a note-content without requiring namespace declarations.
This is part 1 of a fix to get rid of the ugly "fake xml header" that we strap on to note-content just so the parser won't complain.

165. By Olivier Bilodeau on 2009-11-21

Clarified an error message

164. By Olivier Bilodeau on 2009-11-17

Added error reporting in ViewNote (intent.getData null and note null)

163. By Olivier Bilodeau on 2009-11-17

merge + some work
- renamed NoteBuilder to NoteContentBuilder which represent what it does now
- added error reporting to ui in ViewNote's handler
- copyright info to NoteManager.java
- merged Benoit's work (he merged main and some of my previous stuff)
- added TODO tasks

162. By Olivier Bilodeau on 2009-10-05

re-activate debug logging: yes, I need it ;)

161. By Olivier Bilodeau on 2009-10-05

util/NoteBuilder.java
- Builder in local mode is now working with an XML <note-content>..</..> string instead of a File object.
Note.java
- Moved XML parsing responsability from Note.java to NoteBuilder.java
- Took out updateContent() and xmlChanged from Note.java for now (until we have proper caching mechanism)
ui/ViewNote.java
- Using NoteBuilder for local note from database (provides threaded operation)