Merge lp:~tomdroid-dev/tomdroid/sync-ui into lp:~tomdroid-maintainers/tomdroid/main

[Rodja]

Note synchronization support (SD Card and Tomboy Web)

The changes made in the sync-ui branch are of great value to the end users and do not seem to have any obvious bugs. Time to do a 0.4 release!

Not only does the new code introduce a visual progress feedback while syncing, but is also using an Actionbar as lately proposed by the Android developers from Google.

[Olivier Bilodeau (plaxx)]

First, I only glanced quickly at your work but I'm very excited to see your work!

Second, sorry if anything here was already mentionned elsewhere but I haven't replied..

Third, all of this is a matter of discussion. Given the right arguments I will change my mind.

1) order of things
I'm a bit confused with the merge hiearchy here..

Is this based on web-sync meaning we need to merge web-sync first or does this integrates web-sync so merging this will result in a web-sync + sync-ui integration?

2) commons-codec
What is commons-codec used for? Was there no built-in alternative already available? I'm trying to avoid adding a 64k jar into the tomdroid package here.

3) signpost
Not sure what you did with signpost.. haven't looked but can't you use a released jar (with a version we can track bugs against, etc.) instead of having a git checkout of their stuff? Did you need to modify their upstream code? If you can't proceed with released code, can you get rid of the git metadata (signpost/.git/) and identify in a README.tomdroid what revision/repo is this code from and what custom changes you needed done. Also, I would like the eclipse metadata removed.

4) file headers
Some new files are missing the usual project header. Be careful to assign copyright to the right person who created the work. If you are willing to give me the copyright feel free to do so. In any case you will be attributed for your work elsewhere.

Start looking at these please. Once dealt with I'll checkout the branch and play with it.

Thanks!

[Benoit Garret (benoit.garret)]

It's also my fault the merge hasn't been done before, I haven't followed through with Rodja, mainly due to a lack of time on my part.

1) No new commits have been done on the web-sync branch, so the sync-ui supersedes it. This merge request is the right one.

2) commons-codec is needed by signpost. I pulled everything because it was easier, but I believe only a small set of its functionality is needed. We could rip out the parts that interest us and cut down a lot on the size.

3) When I began working with signpost, a few bugs prevented it from working with snowy and ubuntu one, that's why I kept a patched copy. It's just a matter of looking if there's been a release with the fixes I submitted upstream.

4) As far as I know, only Rodja and I worked on this. I suggest we both go through the files and put the notices on the files we know we created.

[lp:~tomdroid-dev/tomdroid/sync-ui]

234. By Rodja on 2010-08-25

Modified copyright headers in files I've worked

235. By Benoit Garret on 2010-08-30

Add copyright and license headers in files I've worked on

236. By Benoit Garret on 2010-08-31

Removed commons-codec and signpost git, using the jar as bugs with Android have been fixed

[Benoit Garret (benoit.garret)]

Every point you've (Olivier) mentioned should be solved now. I originally included commons-codec because the version shipped with Android was buggy and messed with the Authorization headers, but signpost got a custom implementation since then.

You're now welcome to play with the branch ;-), I'm really looking forward to the day this is merged.

[Olivier Bilodeau (plaxx)]

Thanks for addressing my concerns quickly. I'll be trying it on my phone in the next couple of day.

[Olivier Bilodeau (plaxx)]

Hi guys,

I played with the branch for a couple of minutes tonight. Here are my comments:

5) I upgraded and my notes were all still there. However any attempts to open a note resulted in a parsing error. I'm guessing that something changed about the database. If not db then appending note-content tags or not? I would recommend dropping the database on upgrade. It's easy, notes should be on sdcard because sync never existed and nothing should be only in the db since you can't create content yet (oh and we are not 1.0).

6) I'm also unsure about the sync button.. It was not obvious to me at first that I needed to hit that to sync. It's a bit small and the animation for SD card notes was only a dot blinking in the middle. Is that normal? Nothing turning? But this is minor and could be reworked later.

7) Lastly, I'm unsure about the black text on white background for the note list (I haven't tested notes yet since they crash). It is quite the opposite as most android apps (especially the natives one), well.. at least, on my phone (normal android UI). I might revert these changes unless convinced otherwise (or provide an option?).

By the way, I don't want to sound like I'm dumping all this burden on you guys, I'll look into fixing stuff myself but I don't have time now.

I'll be testing more soon. The sync goodness! I can't wait!

review: Needs Fixing

[Rodja (trappe)]

Hi Oliver,

Thank you for looking at this branch.

5) I'm not aware of any db schema changes. I guess the issue you experienced happens if you change from sd-card notes to web sync... but I've no time to investigate this further right now. Benoit, could you help?

6a) I have decided to follow Google's blog article about the Twitter App: http://android-developers.blogspot.com/2010/05/twitter-for-android-closer-look-at.html ? They recommend to use the Action bar for common and often used global actions. See http://code.google.com/intl/de-DE/events/io/2010/sessions/android-ui-design-patterns.html at minute 12:40 for the whole Action bar talking, and note at 14:35: "What are the actions the user should not have to press menu to get at". See also the discussion at https://bugs.launchpad.net/tomdroid/+bug/549643

6b) SD card syncing is very fast so the turning animation is rather a quick jump from 0% to 100%.

7) All newer Google Apps like the Gallery, Android Market, Clock, Google Talk, Google Goggles, ... and the thrid party Apps where Google was involved like Amazon MP3 and the offical Twitter App use a light theme. I think this is a trend Tomdroid should follow.

[Olivier Bilodeau (plaxx)]

Quick note to say that I asked about the color changes to the tomdroid-dev mailing list.

[lp:~tomdroid-dev/tomdroid/sync-ui]

237. By Rodja on 2010-09-26

droping local database when switching between syc methods

238. By Rodja on 2010-09-26

Fixed switching back to sdcard sync method.

239. By Rodja on 2010-09-26

Merged Guilherme Salgado's changes to excludes notebook templates.

[Rodja (trappe)]

Hi Oliver,

5) I've now implemented a simple drop of the local database when switching sync methods. Should fix your issue.

I'm not aware of any other issues or ToDo's which may prevent merging. Please tell me if anything else must be done.

[lp:~tomdroid-dev/tomdroid/sync-ui]

240. By Rodja on 2010-10-03

Merged with Matt Stevenson's freshen-ui branch which introduces last change dates in the note list and inserts the tomdroid logo in the actionbar.

241. By Rodja on 2010-10-03

Made sure the tags member is initalized.

[Olivier Bilodeau (plaxx)]

Ok, thanks, I'll re-test this week and let you know.

For color and style, based on the feedback, we will move forward with what
you have done.

On Sun, Sep 26, 2010 at 8:16 AM, Rodja <email address hidden> wrote:

> Hi Oliver,
>
> 5) I've now implemented a simple drop of the local database when switching
> sync methods. Should fix your issue.
>
> I'm not aware of any other issues or ToDo's which may prevent merging.
> Please tell me if anything else must be done.
> --
> https://code.launchpad.net/~tomdroid-dev/tomdroid/sync-ui/+merge/33434<https://code.launchpad.net/%7Etomdroid-dev/tomdroid/sync-ui/+merge/33434>
> You are reviewing the proposed merge of lp:~tomdroid-dev/tomdroid/sync-ui
> into lp:tomdroid.
>

--
Olivier Bilodeau <email address hidden>

[Olivier Bilodeau (plaxx)]

Performed some tests:
- 1.6 emulator SD Card sync - ok
- 1.6 emulator with QA note set (public.img) - ok
- 2.1 emulator SD Card sync - ok
- 2.1 emulator with QA note set (public.img) - ok
- 1.6 ADP1 SD Card sync - ok
- 1.6 ADP1 with personal note set - ok

Tomorrow or saturday I'll be entering release mode. Now, I'm heading for bug triage and building the NEWS file, actually I will need your help for that as I'm afraid some noteworthy changes and contributors will be lost in all the various branches..

Contributors I have for now: Benoit Garret, Rodja Trappe, Matt Stevenson, Guilherme Salgado

NEWS: I'll start something in lp:tomdroid and you guys send me a patch if I'm missing something new or proper attribution.

Anyone tested the recently launched tomboy-online service? I know I will but only after releasing 0.4.0.

review: Approve

=== modified file '.classpath'
--- .classpath	2010-01-25 05:01:42 +0000
+++ .classpath	2010-10-03 12:21:44 +0000
@@ -3,5 +3,8 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="lib" path="lib/signpost-core-1.2.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/signpost-commonshttp4-1.2.1.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
+  <classpathentry kind="src" path="tests"/>
 </classpath>

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2010-02-18 04:36:08 +0000
+++ AndroidManifest.xml	2010-10-03 12:21:44 +0000
@@ -2,14 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.tomdroid"
       android:versionName="0.3.1" android:versionCode="4">
-      
-	<uses-sdk android:minSdkVersion="3" />
 
+	<uses-sdk android:minSdkVersion="3"
+	          android:targetSdkVersion="4" />
+          
+    <supports-screens android:anyDensity="true" />
+        	       
 	<application 
 		android:icon="@drawable/icon"
 		android:label="@string/app_name"
-		android:debuggable="false"
-		>
+		android:theme="@android:style/Theme.Light.NoTitleBar">
 
         <activity android:label="@string/app_name"
         		  android:name=".ui.Tomdroid"
@@ -19,6 +21,12 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+        		<action android:name="android.intent.action.VIEW" />
+        		<category android:name="android.intent.category.DEFAULT" />
+        		<category android:name="android.intent.category.BROWSABLE" />
+        		<data android:scheme="tomdroid" />
+        	</intent-filter>
         </activity>
     
 		<activity android:name=".ui.ViewNote">
@@ -29,12 +37,19 @@
 			    <data android:mimeType="vnd.android.cursor.item/vnd.tomdroid.note" />
 			</intent-filter>
 		</activity>
-
-		
 		
 		<provider android:name="NoteProvider"
             android:authorities="org.tomdroid.notes"
         />
-</application>
-	<uses-permission android:name="android.permission.INTERNET" />
-</manifest> 
\ No newline at end of file
+        
+        <activity android:name=".ui.PreferencesActivity" android:label="@string/app_name">
+
+    	</activity>
+
+      <uses-library android:name="android.test.runner" />
+    </application>
+    
+	 <uses-permission android:name="android.permission.INTERNET" />
+<instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="org.tomdroid"></instrumentation>
+
+</manifest> 

=== added file 'data/tomdroid-4.svg'
--- data/tomdroid-4.svg	1970-01-01 00:00:00 +0000
+++ data/tomdroid-4.svg	2010-10-03 12:21:44 +0000
@@ -0,0 +1,612 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2394"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   version="1.0"
+   sodipodi:docname="tomdroid-4.png"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/data/code/android/web-sync/res/drawable/tomdroid-4.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs2396">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2402" />
+    <linearGradient
+       id="linearGradient6377">
+      <stop
+         id="stop6379"
+         offset="0"
+         style="stop-color:#fff27e;stop-opacity:1;" />
+      <stop
+         id="stop6381"
+         offset="1"
+         style="stop-color:#edd400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2966">
+      <stop
+         style="stop-color:#ffd1d1;stop-opacity:1;"
+         offset="0"
+         id="stop2968" />
+      <stop
+         id="stop3006"
+         offset="0.5"
+         style="stop-color:#ff1d1d;stop-opacity:1;" />
+      <stop
+         style="stop-color:#6f0000;stop-opacity:1;"
+         offset="1"
+         id="stop2970" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2974">
+      <stop
+         style="stop-color:#c1c1c1;stop-opacity:1;"
+         offset="0"
+         id="stop2976" />
+      <stop
+         style="stop-color:#acacac;stop-opacity:1;"
+         offset="1"
+         id="stop2978" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2994">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2996" />
+      <stop
+         style="stop-color:#c9c9c9;stop-opacity:1;"
+         offset="1"
+         id="stop2998" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective2705"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3103"
+       inkscape:persp3d-origin="60 : 46.666667 : 1"
+       inkscape:vp_z="120 : 70 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 70 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.361345,0,22.29694)"
+       r="5.2591065"
+       fy="31.780704"
+       fx="39.907337"
+       cy="31.780704"
+       cx="39.907337"
+       id="radialGradient6423"
+       xlink:href="#linearGradient6417"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(10.88255,-6.454846e-8,0,11.39737,-433.5968,-381.3811)"
+       r="20.21875"
+       fy="35.90107"
+       fx="43.875"
+       cy="35.90107"
+       cx="43.875"
+       id="radialGradient6413"
+       xlink:href="#linearGradient6407"
+       inkscape:collect="always" />
+    <radialGradient
+       r="21.626934"
+       fy="35.915409"
+       fx="45.150326"
+       cy="35.915409"
+       cx="45.150326"
+       gradientTransform="matrix(1.669712,0,1.702451e-8,1.220484,-30.23773,-11.79928)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6405"
+       xlink:href="#linearGradient6377"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="67.031342"
+       x2="26.130388"
+       y1="14.08672"
+       x1="26.213203"
+       id="linearGradient5615"
+       xlink:href="#linearGradient5609"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5609"
+       inkscape:collect="always">
+      <stop
+         id="stop5611"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop5613"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3342">
+      <stop
+         id="stop3344"
+         offset="0"
+         style="stop-color:#fff27e;stop-opacity:1;" />
+      <stop
+         id="stop3346"
+         offset="1"
+         style="stop-color:#edd400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6407"
+       inkscape:collect="always">
+      <stop
+         id="stop6409"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6411"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6417"
+       inkscape:collect="always">
+      <stop
+         id="stop6419"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop6421"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3326">
+      <stop
+         style="stop-color:#ffd1d1;stop-opacity:1;"
+         offset="0"
+         id="stop3328" />
+      <stop
+         id="stop3330"
+         offset="0.5"
+         style="stop-color:#ff1d1d;stop-opacity:1;" />
+      <stop
+         style="stop-color:#6f0000;stop-opacity:1;"
+         offset="1"
+         id="stop3332" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3319">
+      <stop
+         style="stop-color:#c1c1c1;stop-opacity:1;"
+         offset="0"
+         id="stop3321" />
+      <stop
+         style="stop-color:#acacac;stop-opacity:1;"
+         offset="1"
+         id="stop3323" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2984">
+      <stop
+         style="stop-color:#e7e2b8;stop-opacity:1;"
+         offset="0"
+         id="stop2986" />
+      <stop
+         style="stop-color:#e7e2b8;stop-opacity:0;"
+         offset="1"
+         id="stop2988" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3308">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3310" />
+      <stop
+         style="stop-color:#c9c9c9;stop-opacity:1;"
+         offset="1"
+         id="stop3312" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3305"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2966"
+       id="linearGradient4272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5.669292,0)"
+       x1="48.90625"
+       y1="17.376184"
+       x2="50.988335"
+       y2="22.250591" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2974"
+       id="linearGradient4274"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5.669292,0)"
+       x1="46"
+       y1="19.8125"
+       x2="47.6875"
+       y2="22.625" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2984"
+       id="radialGradient4276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.923565,0,0,2.029717,-61.55532,-27.88417)"
+       cx="29.053354"
+       cy="27.640751"
+       fx="29.053354"
+       fy="27.640751"
+       r="3.2408544" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2994"
+       id="linearGradient4278"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5.825542,0.125)"
+       x1="25.71875"
+       y1="31.046875"
+       x2="25.514589"
+       y2="30.703125" />
+    <inkscape:perspective
+       id="perspective5044"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5252"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5278"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5380"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5404"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5433"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5459"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5509"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5564"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="25.379657"
+     inkscape:cy="34.644751"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="976"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2399">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:date>2009-04-02</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Olivier Bilodeau</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:description>A mashup of Tomboy's icon and Android's logo. Both available under free licences.</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g4242"
+       transform="translate(-0.1684169,3.5830001)">
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         id="rect1975"
+         d="m 10.301452,14.596007 28.649253,0.353553 c 0.762577,0 1.24391,0.576646 1.376493,1.193837 0,0 4.40133,19.815144 4.40133,19.815144 0,0 0.01246,6.347622 0.01246,6.347622 0,0.661386 -0.613915,1.193837 -1.376492,1.193837 l -37.4768304,0 C 5.1250868,43.5 4.5111713,42.967549 4.5111713,42.306163 L 4.4999999,36.139247 8.9249601,15.789844 c 0.3093592,-0.661386 0.6139156,-1.193837 1.3764919,-1.193837 z"
+         style="fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         ry="0.67937863"
+         rx="0.67937863"
+         y="35.957905"
+         x="5.1146202"
+         height="7.0714951"
+         width="39.048077"
+         id="rect2851"
+         style="opacity:0.37078654;fill:#f57900;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path2853"
+         d="m 5.0643333,36.53243 c 0,0 0.1508618,-0.53033 0.704022,-0.574524 l 37.5646027,0 c 0.754309,0 0.804596,0.751301 0.804596,0.751301 0,0 0.0236,-1.619573 -1.283871,-1.619573 l -36.4118845,0 c -1.0057457,0.08839 -1.3774652,0.779883 -1.3774652,1.442796 z"
+         style="opacity:0.16292138;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path4730"
+         d="m 10.3125,15.59375 c -0.151316,0 -0.09946,-0.02674 -0.15625,0.03125 -0.05088,0.05195 -0.155811,0.275085 -0.28125,0.53125 -0.014579,0.02977 -0.016184,0.03029 -0.03125,0.0625 L 5.5,36.125 l 0,0.0625 0,6.125 C 5.5,42.35657 5.572368,42.5 5.875,42.5 l 37.5,0 c 0.302632,0 0.375,-0.143429 0.375,-0.1875 0,0 -0.03035,-6.068147 -0.03125,-6.25 -2.51e-4,-0.0011 4.27e-4,-0.09183 0,-0.09375 C 43.625157,35.547912 39.34375,16.375 39.34375,16.375 39.2872,16.111751 39.174175,15.9375 38.9375,15.9375 l -28.625,-0.34375 z"
+         style="opacity:0.4831461;fill:none;stroke:url(#linearGradient5615);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6415"
+         d="M 44.194174,35.681088 C 43.814854,34.425759 43.31029,31.880389 43.31029,31.880389 l -8.927222,3.181981 c 5.745243,0 8.573669,-0.265165 9.811106,0.618718 z"
+         style="opacity:0.46629214;fill:url(#radialGradient6423);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="fill:url(#radialGradient6405);fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:0.99999964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 8.7832195,16.426565 -4.13483,18.029279 c 0,0 21.4716075,0.125001 29.2755775,0.125001 7.980569,0 11.155067,-2.96842 11.155067,-2.96842 0,0 -1.006743,-0.453488 -2.325109,-4.966721 0,0 -2.403785,-10.500389 -2.403785,-10.500389 -0.463441,-1.186401 -0.856206,-1.663669 -1.75639,-1.65625 l -27.78125,0 c -1.7452746,0.03209 -1.7364187,0.835552 -2.0292805,1.9375 z"
+         id="path2524"
+         sodipodi:nodetypes="cczczcccc" />
+      <path
+         id="path6403"
+         d="m 10.8125,15.5 c -0.640289,0.01823 -0.708297,0.09979 -0.75,0.15625 C 10.01913,15.71497 9.9124269,16.076338 9.75,16.6875 L 5.90625,33.46875 c 1.6944357,0.0098 20.570644,0.125 28.03125,0.125 3.866286,0 6.517278,-0.714302 8.1875,-1.40625 1.054074,-0.436687 1.113325,-0.577029 1.4375,-0.8125 -0.490628,-0.789905 -1.105041,-2.122597 -1.78125,-4.4375 -6.51e-4,-0.02083 -6.51e-4,-0.04167 0,-0.0625 0,0 -2.305929,-10.042349 -2.375,-10.34375 C 39.192263,15.983448 39.024353,15.680487 38.9375,15.59375 38.85065,15.50701 38.86595,15.49776 38.59375,15.5 l -27.75,0 -0.03125,0 z"
+         style="opacity:0.46629214;fill:none;stroke:url(#radialGradient6413);stroke-width:0.99999964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="opacity:0.26404497;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m 5.0643333,38.53243 c 0,0 0.1508618,-0.53033 0.704022,-0.574524 l 37.5646027,0 c 0.754309,0 0.804596,0.751301 0.804596,0.751301 0,0 0.0236,-1.619573 -1.283871,-1.619573 l -36.4118845,0 c -1.0057457,0.08839 -1.3774652,0.779883 -1.3774652,1.442796 z"
+         id="path6359"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path6361"
+         d="m 5.0643333,40.53243 c 0,0 0.1508618,-0.53033 0.704022,-0.574524 l 37.5646027,0 c 0.754309,0 0.804596,0.751301 0.804596,0.751301 0,0 0.0236,-1.619573 -1.283871,-1.619573 l -36.4118845,0 c -1.0057457,0.08839 -1.3774652,0.779883 -1.3774652,1.442796 z"
+         style="opacity:0.26404497;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="opacity:0.26404497;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m 5.0643333,42.53243 c 0,0 0.1508618,-0.53033 0.704022,-0.574524 l 37.5646027,0 c 0.754309,0 0.804596,0.751301 0.804596,0.751301 0,0 0.0236,-1.619573 -1.283871,-1.619573 l -36.4118845,0 c -1.0057457,0.08839 -1.3774652,0.779883 -1.3774652,1.442796 z"
+         id="path6363"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+    <g
+       id="g4166-6"
+       transform="matrix(1.0098472,0,0,0.98902752,-298.47562,-483.65964)"
+       style="fill:#c4a000;fill-opacity:1;stroke:none" />
+    <g
+       id="g3106"
+       inkscape:label="Layer 1"
+       transform="matrix(0.9894224,0,0,0.9894224,86.886011,8.4726515)">
+      <g
+         transform="translate(-299.00515,-503.07627)"
+         id="g3279" />
+    </g>
+    <path
+       style="fill:#d40000;fill-opacity:1;stroke:#ffffff;stroke-width:1.70000005;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 29.78125,1.0249519 c -0.200346,-0.00693 -0.393078,0.104186 -0.5,0.3125001 l -1.375,2.65625 c -1.068903,-0.3679226 -2.237706,-0.5625 -3.46875,-0.5625 -1.366399,0 -2.652232,0.2394169 -3.8125,0.6875 l -1.40625,-2.75 C 19.076187,1.0909499 18.780186,0.99092944 18.53125,1.1187019 18.282314,1.2464745 18.169937,1.5597 18.3125,1.837452 l 1.40625,2.6875 c -2.563621,1.3037284 -4.28125,3.6451702 -4.28125,6.3125 0,0.224276 0.03887,0.43704 0.0625,0.65625 l 17.875,0 c 0.02363,-0.21921 0.0625,-0.431974 0.0625,-0.65625 0,-2.7740229 -1.857873,-5.1997008 -4.59375,-6.46875 l 1.3125,-2.5625 c 0.142563,-0.277752 0.06144,-0.6222276 -0.1875,-0.7500001 -0.06223,-0.031943 -0.120718,-0.028941 -0.1875,-0.03125 z m -16.875,10.7500001 c -1.101761,0 -2,0.898239 -2,2 l 0,8.40625 c 0,1.101761 0.898239,2 2,2 1.101761,0 1.96875,-0.898239 1.96875,-2 l 0,-8.40625 c 0,-1.101761 -0.866989,-2 -1.96875,-2 z m 22.9375,0.15625 c -1.101761,0 -2,0.866989 -2,1.96875 l 0,8.4375 c 0,1.101761 0.898239,2 2,2 1.101761,0 2,-0.898239 2,-2 l 0,-8.4375 c 0,-1.101761 -0.898239,-1.96875 -2,-1.96875 z m -20.21875,0.1875 0,1.15625 0,0.34375 0,1.4375 0,6.25 0,3.75 c 0,1.19785 0.9584,2.15625 2.15625,2.15625 l 1.4375,0 0,4.625 c 0,0.943048 0.744452,1.6875 1.6875,1.6875 l 0.59375,0 c 0.943048,0 1.71875,-0.744452 1.71875,-1.6875 l 0,-4.625 2.5625,0 0,4.59375 c 0,0.943048 0.775702,1.71875 1.71875,1.71875 l 0.59375,0 c 0.943048,0 1.71875,-0.775702 1.71875,-1.71875 l 0,-4.59375 1.1875,0 c 1.19785,0 2.1875,-0.9584 2.1875,-2.15625 l 0,-3.75 0,-6.25 0,-1.78125 0,-1.15625 -17.5625,0 z"
+       id="rect5365-8" />
+    <g
+       id="g5488"
+       style="stroke:none"
+       transform="translate(0,0.39995194)">
+      <path
+         id="rect5365"
+         d="m 15.65625,11.75 0,1.15625 0,0.34375 0,1.4375 0,6.25 0,3.75 c 0,1.19785 0.9584,2.15625 2.15625,2.15625 l 13.21875,0 c 1.19785,0 2.1875,-0.9584 2.1875,-2.15625 l 0,-3.75 0,-6.25 0,-1.78125 0,-1.15625 -17.5625,0 z"
+         style="fill:#97c024;fill-opacity:1;stroke:none" />
+      <rect
+         rx="1.7022525"
+         y="23.661636"
+         x="19.224466"
+         height="9.5017471"
+         width="4.0090432"
+         id="rect5370"
+         style="fill:#97c024;fill-opacity:1;stroke:none" />
+      <rect
+         rx="1.7022525"
+         y="23.645853"
+         x="25.80624"
+         height="9.5017471"
+         width="4.0090432"
+         id="rect5370-3"
+         style="fill:#97c024;fill-opacity:1;stroke:none" />
+      <rect
+         rx="1.9887384"
+         y="11.413537"
+         x="10.922275"
+         height="12.405936"
+         width="3.9774768"
+         id="rect5394"
+         style="fill:#97c024;fill-opacity:1;stroke:none" />
+      <rect
+         rx="1.9887384"
+         y="11.55559"
+         x="33.871677"
+         height="12.405936"
+         width="3.9774768"
+         id="rect5394-2"
+         style="fill:#97c024;fill-opacity:1;stroke:none" />
+      <g
+         transform="translate(-0.20025,0)"
+         id="g5481"
+         style="stroke:none">
+        <path
+           style="fill:#97c024;fill-opacity:1;stroke:none"
+           d="m 24.65625,3.0625 c -4.968725,0 -9,3.3092317 -9,7.40625 0,0.224276 0.03887,0.43704 0.0625,0.65625 l 17.875,0 c 0.02363,-0.21921 0.0625,-0.431974 0.0625,-0.65625 0,-4.0970183 -4.031275,-7.40625 -9,-7.40625 z"
+           id="path5418" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           id="path5449"
+           sodipodi:cx="21.37104"
+           sodipodi:cy="8.3357286"
+           sodipodi:rx="0.78918165"
+           sodipodi:ry="0.77339804"
+           d="m 22.160222,8.3357286 c 0,0.427136 -0.353329,0.7733981 -0.789182,0.7733981 -0.435853,0 -0.789181,-0.3462621 -0.789181,-0.7733981 0,-0.4271359 0.353328,-0.773398 0.789181,-0.773398 0.435853,0 0.789182,0.3462621 0.789182,0.773398 z"
+           transform="matrix(1.0212245,0,0,1.0212245,-1.4154165,-1.4231952)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           id="path5449-6"
+           sodipodi:cx="21.37104"
+           sodipodi:cy="8.3357286"
+           sodipodi:rx="0.78918165"
+           sodipodi:ry="0.77339804"
+           d="m 22.160222,8.3357286 c 0,0.427136 -0.353329,0.7733981 -0.789182,0.7733981 -0.435853,0 -0.789181,-0.3462621 -0.789181,-0.7733981 0,-0.4271359 0.353328,-0.773398 0.789181,-0.773398 0.435853,0 0.789182,0.3462621 0.789182,0.773398 z"
+           transform="matrix(1.0212245,0,0,1.0212245,6.7121839,-1.4238284)" />
+        <rect
+           style="fill:#97c024;fill-opacity:1;stroke:none"
+           id="rect5423"
+           width="1.0101534"
+           height="5.0507627"
+           x="15.824705"
+           y="9.2116003"
+           rx="0.50507671"
+           transform="matrix(0.88965349,-0.45663625,0.45663625,0.88965349,0,0)"
+           ry="0.56354231" />
+        <rect
+           style="fill:#97c024;fill-opacity:1;stroke:none"
+           id="rect5423-6"
+           width="1.0101534"
+           height="5.0507627"
+           x="-27.690969"
+           y="-13.159358"
+           rx="0.50507671"
+           transform="matrix(-0.88965349,-0.45663625,-0.45663625,0.88965349,0,0)"
+           ry="0.56354231" />
+      </g>
+    </g>
+    <g
+       style="display:inline"
+       id="g1574"
+       transform="matrix(0.7113809,-0.1906141,0.1906141,0.7113809,19.866431,-7.0127809)"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true">
+      <path
+         transform="translate(-29.75546,19)"
+         sodipodi:nodetypes="cccccc"
+         id="path2960"
+         d="m 17.34116,32.5 5.625,-5.625 20.093749,-9.75 c 3.25,-1.25 5.1875,3.375 2.3125,5 L 25.34116,31.5 l -8,1 z"
+         style="fill:#cb9022;fill-opacity:1;fill-rule:evenodd;stroke:#5c410c;stroke-width:0.93443578;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         transform="translate(-29.75546,19)"
+         style="fill:url(#linearGradient4272);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m 38.330708,20 c 0,0 1.4375,0.09375 2,1.34375 0.579493,1.287761 0,2.65625 0,2.65625 l 5.03125,-2.46875 c 0,0 1.452032,-0.881367 0.65625,-2.84375 -0.784912,-1.935577 -2.6875,-1.15625 -2.6875,-1.15625 l -5,2.46875 z"
+         id="path2964"
+         sodipodi:nodetypes="czcczcc"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         transform="translate(-29.75546,19)"
+         sodipodi:nodetypes="czcczcc"
+         id="path2962"
+         d="m 38.330708,20 c 0,0 1.4375,0.09375 2,1.34375 0.579493,1.287761 0,2.65625 0,2.65625 l 2,-1 c 0,0 0.827032,-1.318867 0.21875,-2.6875 C 41.924458,18.90625 40.330708,19 40.330708,19 l -2,1 z"
+         style="fill:url(#linearGradient4274);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         transform="translate(-29.75546,19)"
+         sodipodi:nodetypes="cccc"
+         id="path2982"
+         d="m 18.768208,31.78125 4.5,-4.5 c 1.5,0.8125 2.28125,2.15625 1.875,3.71875 l -6.375,0.78125 z"
+         style="fill:url(#radialGradient4276);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         transform="translate(-29.75546,19)"
+         sodipodi:nodetypes="cccc"
+         id="path2992"
+         d="m 20.111958,30.375 -1.625,1.59375 2.34375,-0.3125 c 0.21875,-0.71875 -0.1875,-1.0625 -0.71875,-1.28125 z"
+         style="fill:url(#linearGradient4278);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         transform="translate(-29.75546,19)"
+         sodipodi:nodetypes="ccccc"
+         id="path3002"
+         d="m 23.268208,27.25 1.5625,1.25 15.38734,-7.31867 C 39.773616,20.325286 38.976281,20.096733 38.314669,20.019068 L 23.268208,27.25 z"
+         style="fill:#ffffff;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         transform="translate(-29.75546,19)"
+         sodipodi:nodetypes="ccccc"
+         id="path3004"
+         d="m 25.143208,31.0625 0.1875,-0.75 15.23109,-7.1296 c 0,0 -0.11016,0.613627 -0.215879,0.74935 L 25.143208,31.0625 z"
+         style="fill:#000000;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+    </g>
+  </g>
+</svg>

=== modified file 'default.properties'
--- default.properties	2010-01-25 05:01:42 +0000
+++ default.properties	2010-10-03 12:21:44 +0000
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-3
+target=android-4
 apk-configurations=

=== added directory 'lib'
=== added file 'lib/signpost-commonshttp4-1.2.1.1.jar'
Binary files lib/signpost-commonshttp4-1.2.1.1.jar	1970-01-01 00:00:00 +0000 and lib/signpost-commonshttp4-1.2.1.1.jar	2010-10-03 12:21:44 +0000 differ
=== added file 'lib/signpost-core-1.2.1.1.jar'
Binary files lib/signpost-core-1.2.1.1.jar	1970-01-01 00:00:00 +0000 and lib/signpost-core-1.2.1.1.jar	2010-10-03 12:21:44 +0000 differ
=== added directory 'res/anim'
=== added file 'res/anim/pulse.xml'
--- res/anim/pulse.xml	1970-01-01 00:00:00 +0000
+++ res/anim/pulse.xml	2010-10-03 12:21:44 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:interpolator="@android:anim/accelerate_interpolator"
+       android:fromAlpha="0.0" 
+       android:toAlpha="1.0" 
+       android:duration="500"
+       android:repeatMode="reverse"
+       android:repeatCount="-1"
+       />
\ No newline at end of file

=== added directory 'res/drawable-hdpi'
=== added file 'res/drawable-hdpi/icon_actionbar_dot.png'
Binary files res/drawable-hdpi/icon_actionbar_dot.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/icon_actionbar_dot.png	2010-10-03 12:21:44 +0000 differ
=== added file 'res/drawable-hdpi/icon_actionbar_sync.png'
Binary files res/drawable-hdpi/icon_actionbar_sync.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/icon_actionbar_sync.png	2010-10-03 12:21:44 +0000 differ
=== added file 'res/drawable-hdpi/icon_actionbar_sync_background.png'
Binary files res/drawable-hdpi/icon_actionbar_sync_background.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/icon_actionbar_sync_background.png	2010-10-03 12:21:44 +0000 differ
=== added directory 'res/drawable-mdpi'
=== added file 'res/drawable-mdpi/icon_actionbar_dot.png'
Binary files res/drawable-mdpi/icon_actionbar_dot.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/icon_actionbar_dot.png	2010-10-03 12:21:44 +0000 differ
=== added file 'res/drawable-mdpi/icon_actionbar_sync.png'
Binary files res/drawable-mdpi/icon_actionbar_sync.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/icon_actionbar_sync.png	2010-10-03 12:21:44 +0000 differ
=== added file 'res/drawable-mdpi/icon_actionbar_sync_background.png'
Binary files res/drawable-mdpi/icon_actionbar_sync_background.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/icon_actionbar_sync_background.png	2010-10-03 12:21:44 +0000 differ
=== modified file 'res/drawable/icon.png'
Binary files res/drawable/icon.png	2009-04-03 03:19:35 +0000 and res/drawable/icon.png	2010-10-03 12:21:44 +0000 differ
=== added file 'res/drawable/icon_actionbar_dot.png'
Binary files res/drawable/icon_actionbar_dot.png	1970-01-01 00:00:00 +0000 and res/drawable/icon_actionbar_dot.png	2010-10-03 12:21:44 +0000 differ
=== added file 'res/drawable/icon_actionbar_sync.png'
Binary files res/drawable/icon_actionbar_sync.png	1970-01-01 00:00:00 +0000 and res/drawable/icon_actionbar_sync.png	2010-10-03 12:21:44 +0000 differ
=== added file 'res/drawable/icon_actionbar_sync_background.png'
Binary files res/drawable/icon_actionbar_sync_background.png	1970-01-01 00:00:00 +0000 and res/drawable/icon_actionbar_sync_background.png	2010-10-03 12:21:44 +0000 differ
=== removed file 'res/drawable/icon_sync.png'
Binary files res/drawable/icon_sync.png	2009-10-03 15:29:03 +0000 and res/drawable/icon_sync.png	1970-01-01 00:00:00 +0000 differ
=== added file 'res/drawable/syncbutton_background.xml'
--- res/drawable/syncbutton_background.xml	1970-01-01 00:00:00 +0000
+++ res/drawable/syncbutton_background.xml	2010-10-03 12:21:44 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+	xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+    	android:state_focused="true"
+    	android:state_pressed="false"
+		android:drawable="@drawable/syncbutton_background_focus" />
+    <item
+    	android:state_focused="true"
+    	android:state_pressed="true"
+    	android:drawable="@drawable/syncbutton_background_pressed" />
+    <item
+    	android:state_focused="false"
+    	android:state_pressed="true"
+		android:drawable="@drawable/syncbutton_background_pressed" />
+</selector>
\ No newline at end of file

=== added file 'res/drawable/syncbutton_background_focus.xml'
--- res/drawable/syncbutton_background_focus.xml	1970-01-01 00:00:00 +0000
+++ res/drawable/syncbutton_background_focus.xml	2010-10-03 12:21:44 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid android:color="#ED6400"/>
+</shape>
\ No newline at end of file

=== added file 'res/drawable/syncbutton_background_pressed.xml'
--- res/drawable/syncbutton_background_pressed.xml	1970-01-01 00:00:00 +0000
+++ res/drawable/syncbutton_background_pressed.xml	2010-10-03 12:21:44 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid android:color="#EA9F00"/>
+</shape>
\ No newline at end of file

=== added file 'res/layout/actionbar.xml'
--- res/layout/actionbar.xml	1970-01-01 00:00:00 +0000
+++ res/layout/actionbar.xml	2010-10-03 12:21:44 +0000
@@ -0,0 +1,84 @@
+<!-- 
+ Tomdroid
+ Tomboy on Android
+ http://www.launchpad.net/tomdroid
+
+ Copyright 2010 Rodja Trappe <[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/>.
+-->
+<org.tomdroid.ui.Actionbar 
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/dhistory_row" 
+        android:layout_width="fill_parent" 
+        android:layout_height="40dip"
+        android:background="#ddd"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+        <ImageView
+            android:id="@+id/action_icon"
+            android:src="@drawable/icon"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:scaleType="fitStart"
+            android:padding="4dip"
+            />
+        <TextView 
+            android:id="@+id/title"
+            android:text="Tomdroid"
+            android:layout_marginLeft="42dip"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:textSize="18dip"
+            android:textStyle="bold"
+			android:textColor="#FF555555"
+			android:singleLine="true"
+        	android:ellipsize="marquee"
+        	android:fadingEdge="horizontal"
+        	android:fadingEdgeLength="5mm"
+			android:paddingTop="10dip"
+			android:paddingRight="30dip"
+            />
+        <ImageView
+            android:id="@+id/sync"
+            android:src="@drawable/icon_actionbar_sync_background"
+            android:background="@drawable/syncbutton_background"
+            android:layout_alignParentRight="true"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:scaleType="center"
+            android:clickable="true"
+            android:focusable="true"
+            />
+        <ImageView
+            android:id="@+id/syncIcon"
+            android:src="@drawable/icon_actionbar_sync"
+            android:background="#00000000"
+            android:layout_alignParentRight="true"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:scaleType="center"
+            />
+        <ImageView
+             android:id="@+id/sync_dot"
+             android:src="@drawable/icon_actionbar_dot"
+             android:layout_alignParentRight="true"
+             android:layout_width="wrap_content"
+             android:layout_height="fill_parent"
+             android:scaleType="center"
+             android:visibility="invisible"
+             />
+</org.tomdroid.ui.Actionbar>
\ No newline at end of file

=== modified file 'res/layout/main.xml'
--- res/layout/main.xml	2009-09-29 04:42:34 +0000
+++ res/layout/main.xml	2010-10-03 12:21:44 +0000
@@ -22,17 +22,23 @@
  along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:orientation="vertical"
     	>
+
+    <include android:id="@+id/actionbar" layout="@layout/actionbar" />
     
-    <ListView android:id="@+id/android:list"
+    <ListView android:id="@android:id/android:list"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
+              android:divider="#00000000"
+              android:dividerHeight="0px"
+              android:cacheColorHint="#ffdddddd"
               />
   	<TextView android:id="@+id/list_empty"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:text="@string/strListEmptyNoNotes"
               />
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file

=== modified file 'res/layout/main_list_item.xml'
--- res/layout/main_list_item.xml	2009-06-23 02:51:17 +0000
+++ res/layout/main_list_item.xml	2010-10-03 12:21:44 +0000
@@ -21,9 +21,28 @@
  You should have received a copy of the GNU General Public License
  along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<TextView android:id="@+id/note_title" xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:textSize="24dp"
-		android:padding="10dip"
-		/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content" >
+	<TextView android:id="@+id/note_title" xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:textStyle="bold"
+		android:textColor="#FF555555"
+		android:textSize="18dp"
+		android:paddingTop="5dip"
+		android:paddingLeft="5dip"
+		android:paddingRight="5dip"
+		/>
+	<TextView android:id="@+id/note_date" xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:textColor="#FF555555"
+		android:textSize="14dp"
+		android:paddingTop="2dip"
+		android:paddingLeft="5dip"
+		android:paddingRight="5dip"
+		android:paddingBottom="5dip"
+		/>
+</LinearLayout>
\ No newline at end of file

=== modified file 'res/layout/note_view.xml'
--- res/layout/note_view.xml	2009-06-17 11:02:51 +0000
+++ res/layout/note_view.xml	2010-10-03 12:21:44 +0000
@@ -21,22 +21,40 @@
  You should have received a copy of the GNU General Public License
  along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
 -->
-
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:orientation="vertical"
+    	>
+<include android:id="@+id/actionbar" layout="@layout/actionbar" />
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 			android:id="@+id/textScroller"
 			android:layout_width="fill_parent"
 			android:layout_height="fill_parent"
-			>
-
-	<TextView 
-			  xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:id="@+id/content"
-			  android:layout_width="wrap_content" 
-			  android:layout_height="wrap_content"
-			  android:singleLine="false"
-			  android:text="@string/strWait"
-			  android:padding="10dip"
-			  android:textColor="#ffb8bcb8"
-			  />
-			  
+			android:background="#ffffffff"
+			>			
+	<LinearLayout 
+		android:id="@+id/LinearLayout01" 
+		android:orientation="vertical"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent">
+	    
+		<!-- <TextView 
+			android:id="@+id/title" 
+			android:layout_width="fill_parent" 
+			android:layout_height="wrap_content"
+			android:padding="10dip"
+			android:textStyle="bold" />-->
+		
+		<TextView 
+				  xmlns:android="http://schemas.android.com/apk/res/android"
+				  android:id="@+id/content"
+				  android:layout_width="wrap_content" 
+				  android:layout_height="wrap_content"
+				  android:singleLine="false"
+				  android:text="@string/strWait"
+				  android:padding="10dip"
+				  android:textColor="#ffb8bcb8" />
+	</LinearLayout>
 </ScrollView>
+</LinearLayout>
\ No newline at end of file

=== modified file 'res/menu/main.xml'
--- res/menu/main.xml	2010-01-31 22:30:28 +0000
+++ res/menu/main.xml	2010-10-03 12:21:44 +0000
@@ -23,17 +23,15 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<item
-			android:icon="@drawable/icon_sync"
-			android:title="@string/menuSyncWithSD"
-			android:id="@+id/menuSyncWithSD"
-			/>
-				
-	
 	<item 
 			android:icon="@drawable/icon_about"
 			android:title="@string/menuAbout"
 			android:id="@+id/menuAbout"
 			/>
-
+	
+	
+	<item 
+			android:icon="@android:drawable/ic_menu_preferences"
+			android:title="@string/menuPrefs"
+			android:id="@+id/menuPrefs"/>
 </menu>

=== added file 'res/values/arrays.xml'
--- res/values/arrays.xml	1970-01-01 00:00:00 +0000
+++ res/values/arrays.xml	2010-10-03 12:21:44 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<array name="sortOrderArray">
+	<item>sort_date</item>
+	<item>sort_title</item>
+</array>
+<array name="sortOrderValues">
+	<item>Date Modified</item>
+	<item>Note Title</item>
+</array>
+</resources>

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2010-01-31 21:54:19 +0000
+++ res/values/strings.xml	2010-10-03 12:21:44 +0000
@@ -33,7 +33,8 @@
     	the tomdroid/ directory on your sdcard then press \"Menu\" and \"Sync with SD Card\".
     </string>
     
-    <string name="menuSyncWithSD">Sync with SD Card</string>
+    <string name="menuSync">Sync</string>
+	<string name="menuPrefs">Settings</string>
     <string name="menuAbout">About</string>
     <string name="strWelcome">
     	Welcome to Tomdroid.
@@ -59,5 +60,15 @@
 
 	<!-- note-view.xml -->
     <string name="strWait">Please wait while note loads...</string>
-    
+
+	<string name="prefSync">Synchronization</string>
+
+	<string name="prefSyncService">Service</string>
+	<string name="prefSyncServer">Server</string>
+	<string name="prefAuthenticate">Authenticate</string>
+
+	<string name="prefSyncConnectionFailed">The connection to the server has failed, please check that the address you entered is correct.</string>
+	<string name="prefServerEmpty">The server address changed but the new value is empty</string>
+
+
 </resources>

=== added directory 'res/xml'
=== added file 'res/xml/preferences.xml'
--- res/xml/preferences.xml	1970-01-01 00:00:00 +0000
+++ res/xml/preferences.xml	2010-10-03 12:21:44 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+	                        
+	<PreferenceCategory android:title="@string/prefSync">
+		
+		<ListPreference android:title="@string/prefSyncService"
+						android:dialogTitle="Choose the sync service to use"
+						android:key="sync_service" 
+						android:defaultValue="tomboy-web"/>
+						
+		<EditTextPreference android:key="sync_server"
+							android:title="@string/prefSyncServer"
+							android:positiveButtonText="@string/prefAuthenticate"
+							android:shouldDisableView="true"/>
+							
+	</PreferenceCategory>
+	
+</PreferenceScreen>
\ No newline at end of file

=== modified file 'src/org/tomdroid/Note.java'
--- src/org/tomdroid/Note.java	2010-02-18 03:58:09 +0000
+++ src/org/tomdroid/Note.java	2010-10-03 12:21:44 +0000
@@ -4,6 +4,7 @@
  * http://www.launchpad.net/tomdroid
  * 
  * Copyright 2008, 2009 Olivier Bilodeau <[e-mail]>
+ * Copyright 2009, Benoit Garret <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -26,7 +27,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.json.JSONObject;
+import org.json.JSONArray;
 import org.tomdroid.util.NoteContentBuilder;
+import org.tomdroid.util.XmlUtils;
 
 import android.os.Handler;
 import android.text.SpannableStringBuilder;
@@ -43,6 +47,7 @@
 	public static final String MODIFIED_DATE = "modified_date";
 	public static final String URL = "url";
 	public static final String FILE = "file";
+	public static final String TAGS = "tags";
 	public static final String NOTE_CONTENT = "content";
 	
 	// Logging info
@@ -52,9 +57,9 @@
 	// TODO this is a weird yellow that was usable for the android emulator, I must confirm this for real usage
 	public static final int NOTE_HIGHLIGHT_COLOR = 0xFFFFFF77;
 	public static final String NOTE_MONOSPACE_TYPEFACE = "monospace";
-	public static final float NOTE_SIZE_SMALL_FACTOR = 0.8f;
-	public static final float NOTE_SIZE_LARGE_FACTOR = 1.3f;
-	public static final float NOTE_SIZE_HUGE_FACTOR = 1.6f;
+	public static final float NOTE_SIZE_SMALL_FACTOR = 1.0f;
+	public static final float NOTE_SIZE_LARGE_FACTOR = 1.5f;
+	public static final float NOTE_SIZE_HUGE_FACTOR = 1.8f;
 	
 	// Members
 	private SpannableStringBuilder noteContent;
@@ -62,6 +67,7 @@
 	private String url;
 	private String fileName;
 	private String title;
+	private String tags;
 	private Time lastChangeDate;
 	private int dbId;
 	private UUID guid;
@@ -73,8 +79,32 @@
 			".+" + 														// matches what we are getting rid of
 			"([-\\+]\\d{2}:\\d{2})");									// matches timezone (-xx:xx or +xx:xx)
 	
-	public Note() {}
-	
+	public Note() {
+		tags = new String();
+	}
+	
+	public Note(JSONObject json) {
+		
+		// These methods return an empty string if the key is not found
+		setTitle(XmlUtils.unescape(json.optString("title")));
+		setGuid(json.optString("guid"));
+		setLastChangeDate(json.optString("last-change-date"));
+		setXmlContent(json.optString("note-content"));
+		JSONArray jtags = json.optJSONArray("tags");
+		String tag;
+		tags = new String();
+		if (jtags != null) {
+			for (int i = 0; i < jtags.length(); i++ ) {
+				tag = jtags.optString(i);
+				tags += tag + ",";
+			}
+		}
+	}
+	
+	public String getTags() {
+		return tags;
+	}
+
 	public String getUrl() {
 		return url;
 	}
@@ -138,7 +168,7 @@
 	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) {
 		

=== modified file 'src/org/tomdroid/NoteManager.java'
--- src/org/tomdroid/NoteManager.java	2010-01-25 05:01:42 +0000
+++ src/org/tomdroid/NoteManager.java	2010-10-03 12:21:44 +0000
@@ -23,12 +23,15 @@
 package org.tomdroid;
 
 import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.NoteListCursorAdapter;
+import org.tomdroid.util.Preferences;
 
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
+import android.preference.ListPreference;
 import android.util.Log;
 import android.widget.ListAdapter;
 import android.widget.SimpleCursorAdapter;
@@ -36,8 +39,9 @@
 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[] LIST_PROJECTION = { Note.ID, Note.TITLE, Note.MODIFIED_DATE };
 	public static final String[] TITLE_PROJECTION = { Note.TITLE };
+	public static final String[] GUID_PROJECTION = { Note.ID, Note.GUID };
 	public static final String[] ID_PROJECTION = { Note.ID };
 	public static final String[] EMPTY_PROJECTION = {};
 	
@@ -95,6 +99,7 @@
 		// 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.TAGS, note.getTags());
 		
 		if (managedCursor.getCount() == 0) {
 			
@@ -113,18 +118,42 @@
 		}
 	}
 	
+	public static boolean deleteNote(Activity activity, int id)
+	{
+		Uri uri = Uri.parse(Tomdroid.CONTENT_URI+"/"+id);
+		
+		ContentResolver cr = activity.getContentResolver();
+		int result = cr.delete(uri, null, null);
+		
+		if(result > 0)
+			return true;
+		else
+			return false;
+	}
+	
+	public static Cursor getAllNotes(Activity activity, Boolean includeNotebookTemplates) {
+		// get a cursor representing all notes from the NoteProvider
+		Uri notes = Tomdroid.CONTENT_URI;
+		String where = null;
+		String orderBy;
+		if (!includeNotebookTemplates) {
+			where = Note.TAGS + " NOT LIKE '%" + "system:template" + "%'";
+		}
+		orderBy = Note.MODIFIED_DATE + " DESC";
+		return activity.managedQuery(notes, LIST_PROJECTION, where, null, orderBy);		
+	}
+	
+
 	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);
+
+		Cursor notesCursor = getAllNotes(activity, false);
 		
 		// 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);
+		String[] from = new String[] { Note.TITLE, Note.MODIFIED_DATE };
+		int[] to = new int[] { R.id.note_title, R.id.note_date };
+		return new NoteListCursorAdapter(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) {
 		
@@ -132,6 +161,13 @@
 		return activity.managedQuery(Tomdroid.CONTENT_URI, TITLE_PROJECTION, null, null, null);
 	}
 	
+	// gets the ids of the notes present in the db, used in SyncService.deleteNotes()
+	public static Cursor getGuids(Activity activity) {
+		
+		// get a cursor containing the notes guids
+		return activity.managedQuery(Tomdroid.CONTENT_URI, GUID_PROJECTION, null, null, null);
+	}
+	
 	public static int getNoteId(Activity activity, String title) {
 		
 		int id = 0;

=== modified file 'src/org/tomdroid/NoteProvider.java'
--- src/org/tomdroid/NoteProvider.java	2010-01-25 05:01:42 +0000
+++ src/org/tomdroid/NoteProvider.java	2010-10-03 12:21:44 +0000
@@ -4,6 +4,7 @@
  * http://www.launchpad.net/tomdroid
  * 
  * Copyright 2009 Olivier Bilodeau <[e-mail]>
+ * Copyright 2009 Benoit Garret <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -68,7 +69,7 @@
 	// --	
 	private static final String DATABASE_NAME = "tomdroid-notes.db";
 	private static final String DB_TABLE_NOTES = "notes";
-	private static final int DB_VERSION = 2;
+	private static final int DB_VERSION = 3;
 	private static final String DEFAULT_SORT_ORDER = Note.MODIFIED_DATE + " DESC";
 	
     private static HashMap<String, String> notesProjectionMap;
@@ -99,7 +100,8 @@
                     + Note.TITLE + " TEXT,"
                     + Note.FILE + " TEXT,"
                     + Note.NOTE_CONTENT + " TEXT,"
-                    + Note.MODIFIED_DATE + " STRING"
+                    + Note.MODIFIED_DATE + " STRING,"
+                    + Note.TAGS + " STRING"
                     + ");");
         }
 
@@ -296,6 +298,7 @@
         notesProjectionMap.put(Note.TITLE, Note.TITLE);
         notesProjectionMap.put(Note.FILE, Note.FILE);
         notesProjectionMap.put(Note.NOTE_CONTENT, Note.NOTE_CONTENT);
+        notesProjectionMap.put(Note.TAGS, Note.TAGS);
         notesProjectionMap.put(Note.MODIFIED_DATE, Note.MODIFIED_DATE);
     }
 }

=== added directory 'src/org/tomdroid/sync'
=== added file 'src/org/tomdroid/sync/ServiceAuth.java'
--- src/org/tomdroid/sync/ServiceAuth.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/sync/ServiceAuth.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,33 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2009, Benoit Garret <[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.sync;
+
+import android.net.Uri;
+import android.os.Handler;
+
+public interface ServiceAuth {
+	
+	public boolean isConfigured();
+	public void getAuthUri(final String server, Handler handler);
+	public void remoteAuthComplete(Uri uri, Handler handler);
+}

=== added file 'src/org/tomdroid/sync/SyncManager.java'
--- src/org/tomdroid/sync/SyncManager.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/sync/SyncManager.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,106 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2009, Benoit Garret <[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.sync;
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+
+import org.tomdroid.sync.sd.SdCardSyncService;
+import org.tomdroid.sync.web.SnowySyncService;
+import org.tomdroid.util.Preferences;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.util.Log;
+
+public class SyncManager {
+	
+	private static final String TAG = "SyncManager";
+	
+	private ArrayList<SyncService> services = new ArrayList<SyncService>();
+	
+	public SyncManager() {
+		createServices();
+	}
+
+	public ArrayList<SyncService> getServices() {
+		return services;
+	}
+	
+	public SyncService getService(String name) {
+		
+		for (int i = 0; i < services.size(); i++) {
+			SyncService service = services.get(i);			
+			if (name.equals(service.getName()))
+				return service;
+		}
+		
+		return null;
+	}
+	
+	public void startSynchronization() {
+		
+		SyncService service = getCurrentService();
+		service.startSynchronization();
+	}
+	
+	public SyncService getCurrentService() {
+		String serviceName = Preferences.getString(Preferences.Key.SYNC_SERVICE);
+		return getService(serviceName);
+	}
+	
+	private static SyncManager instance = null;
+	private static Activity activity;
+	private static Handler handler;
+	
+	public static SyncManager getInstance() {
+		
+		if (instance == null)
+			instance = new SyncManager();
+		
+		return instance;
+	}
+	
+	public static void setActivity(Activity a) {
+		activity = a;
+		getInstance().createServices();
+	}
+	
+	public static void setHandler(Handler h) {
+		handler = h;
+		getInstance().createServices();
+	}
+
+	private void createServices() {
+		services.clear();
+		
+		services.add(new SnowySyncService(activity, handler));
+		
+		try {
+			services.add(new SdCardSyncService(activity, handler));
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+}

=== added file 'src/org/tomdroid/sync/SyncService.java'
--- src/org/tomdroid/sync/SyncService.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/sync/SyncService.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,196 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2009, Olivier Bilodeau <[e-mail]>
+ * Copyright 2009, Benoit Garret <[e-mail]>
+ * Copyright 2010, Rodja Trappe <[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.sync;
+
+import java.util.ArrayList;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.tomdroid.Note;
+import org.tomdroid.NoteManager;
+import org.tomdroid.ui.Tomdroid;
+
+import android.app.Activity;
+import android.database.Cursor;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.widget.Toast;
+
+public abstract class SyncService {
+	
+	private static final String TAG = "SyncService";
+	
+	private Activity activity;
+	private final ExecutorService pool;
+	private final static int poolSize = 1;
+	
+	private Handler handler;
+	private int syncProgress = 100;
+	
+	// handler messages
+	public final static int PARSING_COMPLETE = 1;
+	public final static int PARSING_FAILED = 2;
+	public final static int PARSING_NO_NOTES = 3;
+	public final static int NO_INTERNET = 4;
+	public final static int SYNC_PROGRESS = 5;
+	
+	public SyncService(Activity activity, Handler handler) {
+		
+		this.activity = activity;
+		this.handler = handler;
+		pool = Executors.newFixedThreadPool(poolSize);
+	}
+
+	public void startSynchronization() {
+		
+		if (syncProgress != 100){
+			Toast.makeText(activity, "Sync already in prgress", Toast.LENGTH_SHORT).show();
+			return;
+		}
+		
+		sync();
+	}
+	
+	protected abstract void sync();
+	public abstract boolean needsServer();
+	public abstract boolean needsAuth();
+	
+	/**
+	 * @return An unique identifier, not visible to the user.
+	 */
+	
+	public abstract String getName();
+	
+	/**
+	 * @return An human readable name, used in the preferences to distinguish the different sync services.
+	 */
+	
+	public abstract String getDescription();
+	
+	/**
+	 * Execute code in a separate thread.
+	 * Use this for blocking and/or cpu intensive operations and thus avoid blocking the UI.
+	 * 
+	 * @param r The Runner subclass to execute
+	 */
+	
+	protected void execInThread(Runnable r) {
+		
+		pool.execute(r);
+	}
+	
+	/**
+	 * Insert a note in the content provider. The identifier for the notes is the guid.
+	 * 
+	 * @param note The note to insert.
+	 */
+	
+	protected void insertNote(Note note, boolean syncFinished) {
+		
+		NoteManager.putNote(this.activity, note);
+		
+		// if last note warn in UI that we are done
+		if (syncFinished) {
+			handler.sendEmptyMessage(PARSING_COMPLETE);
+		}
+	}
+	
+	/**
+	 * Delete notes in the content provider. The guids passed identify the notes existing
+	 * on the remote end (ie. that shouldn't be deleted).
+	 * 
+	 * @param remoteGuids The notes NOT to delete.
+	 */
+	
+	protected void deleteNotes(ArrayList<String> remoteGuids) {
+		
+		Cursor localGuids = NoteManager.getGuids(this.activity);
+		
+		// cursor must not be null and must return more than 0 entry 
+		if (!(localGuids == null || localGuids.getCount() == 0)) {
+			
+			String localGuid;
+			
+			localGuids.moveToFirst();
+			
+			do {
+				localGuid = localGuids.getString(localGuids.getColumnIndexOrThrow(Note.GUID));
+				
+				if(!remoteGuids.contains(localGuid)) {
+					int id = localGuids.getInt(localGuids.getColumnIndexOrThrow(Note.ID));
+					NoteManager.deleteNote(this.activity, id);
+				}
+				
+			} while (localGuids.moveToNext());
+			
+		} else {
+			
+			// TODO send an error to the user
+			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "Cursor returned null or 0 notes");
+		}
+	}
+	
+	/**
+	 * Send a message to the main UI.
+	 * 
+	 * @param message The message id to send, the PARSING_* or NO_INTERNET attributes can be used.
+	 */
+	
+	protected void sendMessage(int message) {
+		
+		handler.sendEmptyMessage(message);
+	}
+	
+	/**
+	 * Update the synchronization progress
+	 * 
+	 * @param progress 
+	 */
+	
+	protected void setSyncProgress(int progress) {
+		synchronized (TAG) {
+			Log.v(TAG, "sync progress: " + progress);
+			Message progressMessage = new Message();
+			progressMessage.what = SYNC_PROGRESS;
+			progressMessage.arg1 = progress;
+			progressMessage.arg2 = syncProgress;
+
+			handler.sendMessage(progressMessage);
+			syncProgress = progress;
+		}
+	}
+	
+	protected int getSyncProgress(){
+		synchronized (TAG) {
+			return syncProgress;
+		}
+	}
+
+	public boolean isSyncable() {
+		return getSyncProgress() == 100;
+	}
+}

=== added directory 'src/org/tomdroid/sync/sd'
=== renamed file 'src/org/tomdroid/xml/NoteHandler.java' => 'src/org/tomdroid/sync/sd/NoteHandler.java'
--- src/org/tomdroid/xml/NoteHandler.java	2010-02-16 05:18:09 +0000
+++ src/org/tomdroid/sync/sd/NoteHandler.java	2010-10-03 12:21:44 +0000
@@ -4,6 +4,7 @@
  * http://www.launchpad.net/tomdroid
  * 
  * Copyright 2008, 2009, 2010 Olivier Bilodeau <[e-mail]>
+ * Copyright 2009, Benoit Garret <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -20,7 +21,7 @@
  * 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;
+package org.tomdroid.sync.sd;
 
 import org.tomdroid.Note;
 import org.xml.sax.Attributes;

=== renamed file 'src/org/tomdroid/util/AsyncNoteLoaderAndParser.java' => 'src/org/tomdroid/sync/sd/SdCardSyncService.java'
--- src/org/tomdroid/util/AsyncNoteLoaderAndParser.java	2010-02-16 05:18:09 +0000
+++ src/org/tomdroid/sync/sd/SdCardSyncService.java	2010-10-03 12:21:44 +0000
@@ -4,6 +4,8 @@
  * http://www.launchpad.net/tomdroid
  * 
  * Copyright 2009, 2010 Olivier Bilodeau <[e-mail]>
+ * Copyright 2009, Benoit Garret <[e-mail]>
+ * Copyright 2010, Rodja Trappe <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -20,17 +22,16 @@
  * 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;
+package org.tomdroid.sync.sd;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 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;
 
@@ -39,9 +40,8 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.tomdroid.Note;
-import org.tomdroid.NoteManager;
+import org.tomdroid.sync.SyncService;
 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;
@@ -51,55 +51,75 @@
 import android.util.Log;
 import android.util.TimeFormatException;
 
-public class AsyncNoteLoaderAndParser {
-	
-	// thread pool info
-	private final ExecutorService pool;
-	private final static int poolSize = 1;
-	
-	// members
-	private Activity activity;
+public class SdCardSyncService extends SyncService {
+	
 	private File path;
-	private Handler handler;
-	
-	// handler messages
-	public final static int PARSING_COMPLETE = 1;
-	public final static int PARSING_FAILED = 2;
-	public final static int PARSING_NO_NOTES = 3;
+	private int numberOfFilesToSync = 0;
 	
 	// regexp for <note-content..>...</note-content>
-	private static Pattern note_content = Pattern.compile(".*(<note-content.*>.*<\\/note-content>).*", Pattern.CASE_INSENSITIVE+Pattern.DOTALL);
+	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(Activity a, File path) {
-		this.activity = a;
-		this.path = path;
-		
-		pool = Executors.newFixedThreadPool(poolSize);
-	}
-
-	public void readAndParseNotes(Handler hndl) {
-		handler = hndl;
+	private final static String TAG = "SdCardSyncService";
+	
+	public SdCardSyncService(Activity activity, Handler handler) throws FileNotFoundException {
+		super(activity, handler);
+		
+		path = new File(Tomdroid.NOTES_PATH);
+		
+		if (!path.exists())
+			path.mkdir();
+	}
+	
+	@Override
+	public String getDescription() {
+		return "SD Card";
+	}
+
+	@Override
+	public String getName() {
+		return "sdcard";
+	}
+
+	@Override
+	public boolean needsServer() {
+		return false;
+	}
+	
+	@Override
+	public boolean needsAuth() {
+		return false;
+	}
+
+	@Override
+	protected void sync() {
+
+		setSyncProgress(0);
+
+		// start loading local notes
+		if (Tomdroid.LOGGING_ENABLED) Log.v(TAG, "Loading local notes");
+		
 		File[] fileList = path.listFiles(new NotesFilter());
+		numberOfFilesToSync  = fileList.length;
 		
 		// If there are no notes, warn the UI through an empty message
-		if (fileList.length == 0) {
+		if (fileList == null || fileList.length == 0) {
 			if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "There are no notes in "+path);
-			handler.sendEmptyMessage(PARSING_NO_NOTES);
+			sendMessage(PARSING_NO_NOTES);
+			setSyncProgress(100);
 			return;
 		}
 		
 		// every but the last note
 		for(int i = 0; i < fileList.length-1; i++) {
+			// TODO better progress reporting from within the workers
 			
 			// give a filename to a thread and ask to parse it
-			pool.execute(new Worker(fileList[i], false));
+			execInThread(new Worker(fileList[i], false));
         }
 		
 		// last task, warn it so it'll warn UI when done
-		pool.execute(new Worker(fileList[fileList.length-1], true));
+		execInThread(new Worker(fileList[fileList.length-1], true));
 	}
 	
 	/**
@@ -145,7 +165,7 @@
 		
 		        // 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);
@@ -157,7 +177,7 @@
 		        
 				if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "parsing note");
 				xr.parse(is);
-			
+
 			// TODO wrap and throw a new exception here
 			} catch (ParserConfigurationException e) {
 				e.printStackTrace();
@@ -168,7 +188,8 @@
 			} catch (TimeFormatException e) {
 				e.printStackTrace();
 				if (Tomdroid.LOGGING_ENABLED) Log.e(TAG, "Problem parsing the note's date and time");
-				handler.sendEmptyMessage(PARSING_FAILED);
+				sendMessage(PARSING_FAILED);
+				onWorkDone();
 				return;
 			}
 
@@ -202,12 +223,15 @@
 				if (Tomdroid.LOGGING_ENABLED) Log.w(TAG, "Something went wrong trying to read the note");
 			}
 			
-			NoteManager.putNote(AsyncNoteLoaderAndParser.this.activity, note);
-			
-			// if last note warn in UI that we are done
-			if (isLast) {
-				handler.sendEmptyMessage(PARSING_COMPLETE);
-			}
+			insertNote(note, isLast);
+			onWorkDone();
+		}
+		
+		private void onWorkDone(){
+			if (isLast) 
+				setSyncProgress(100);
+			else
+				setSyncProgress((int) (getSyncProgress() + 100.0 / numberOfFilesToSync));			
 		}
 	}
 }

=== added directory 'src/org/tomdroid/sync/web'
=== added file 'src/org/tomdroid/sync/web/AnonymousConnection.java'
--- src/org/tomdroid/sync/web/AnonymousConnection.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/sync/web/AnonymousConnection.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,62 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2009, Benoit Garret <[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.sync.web;
+
+import java.io.UnsupportedEncodingException;
+import java.net.UnknownHostException;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.StringEntity;
+
+public class AnonymousConnection extends WebConnection {
+
+	@Override
+	public String get(String uri) throws UnknownHostException
+	{
+		// Prepare a request object
+		HttpGet httpGet = new HttpGet(uri);
+		HttpResponse response = execute(httpGet);
+		return parseResponse(response);
+	}
+	
+	@Override
+	public String put(String uri, String data) throws UnknownHostException {
+		
+		// Prepare a request object
+		HttpPut httpPut = new HttpPut(uri);
+		
+		try {
+			// The default http content charset is ISO-8859-1, JSON requires UTF-8
+			httpPut.setEntity(new StringEntity(data, "UTF-8"));
+		} catch (UnsupportedEncodingException e1) {
+			e1.printStackTrace();
+			return null;
+		}
+		
+		httpPut.setHeader("Content-Type", "application/json");
+		HttpResponse response = execute(httpPut);
+		return parseResponse(response);
+	}
+}

=== added file 'src/org/tomdroid/sync/web/OAuthConnection.java'
--- src/org/tomdroid/sync/web/OAuthConnection.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/sync/web/OAuthConnection.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,278 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2009, Benoit Garret <[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.sync.web;
+
+import java.io.UnsupportedEncodingException;
+import java.net.UnknownHostException;
+
+import oauth.signpost.OAuthConsumer;
+import oauth.signpost.OAuthProvider;
+import oauth.signpost.commonshttp.CommonsHttpOAuthConsumer;
+import oauth.signpost.commonshttp.CommonsHttpOAuthProvider;
+import oauth.signpost.exception.OAuthCommunicationException;
+import oauth.signpost.exception.OAuthExpectationFailedException;
+import oauth.signpost.exception.OAuthMessageSignerException;
+import oauth.signpost.exception.OAuthNotAuthorizedException;
+
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.StringEntity;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.Preferences;
+
+import android.net.Uri;
+import android.util.Log;
+
+public class OAuthConnection extends WebConnection {
+	
+	private static final String TAG = "OAuthConnection";
+	private static final String CONSUMER_KEY = "anyone";
+	private static final String CONSUMER_SECRET = "anyone";
+	
+	private OAuthConsumer consumer = null;
+	
+	public String accessToken = "";
+	public String accessTokenSecret = "";
+	public String requestToken = "";
+	public String requestTokenSecret = "";
+	public boolean oauth10a = false;
+	public String authorizeUrl = "";
+	public String requestTokenUrl = "";
+	public String accessTokenUrl = "";
+	public String rootApi = "";
+	public String userApi = "";
+	
+	public OAuthConnection() {
+		
+		consumer = new CommonsHttpOAuthConsumer(
+				CONSUMER_KEY,
+				CONSUMER_SECRET);
+	}
+
+	public boolean isAuthenticated() {
+		
+		if (accessToken.equals("") || accessTokenSecret.equals(""))
+			return false;
+		else
+			return true;
+	}
+	
+	private OAuthProvider getProvider() {
+		
+		// Use the provider bundled with signpost, the android libs are buggy
+		// See: http://code.google.com/p/oauth-signpost/issues/detail?id=20
+		OAuthProvider provider = new CommonsHttpOAuthProvider(
+				requestTokenUrl,
+				accessTokenUrl,
+				authorizeUrl);
+		provider.setOAuth10a(oauth10a);
+		
+		return provider;
+	}
+	
+	private void sign(HttpRequest request) {
+		
+		if (isAuthenticated())
+			consumer.setTokenWithSecret(accessToken, accessTokenSecret);
+		else
+			return;
+		
+		// TODO: figure out if we should throw exceptions
+		try {
+			consumer.sign(request);
+		} catch (OAuthMessageSignerException e1) {
+			e1.printStackTrace();
+		} catch (OAuthExpectationFailedException e1) {
+			e1.printStackTrace();
+		} catch (OAuthCommunicationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	public Uri getAuthorizationUrl(String server) throws UnknownHostException {
+		
+		String url = "";
+		
+		// this method shouldn't have been called
+		if (isAuthenticated())
+			return null;
+		
+		rootApi = server+"/api/1.0/";
+		
+		AnonymousConnection connection = new AnonymousConnection();
+		String response = connection.get(rootApi);
+		
+		JSONObject jsonResponse;
+		
+		try {
+			jsonResponse = new JSONObject(response);
+			
+			accessTokenUrl = jsonResponse.getString("oauth_access_token_url");
+			requestTokenUrl = jsonResponse.getString("oauth_request_token_url");
+			authorizeUrl = jsonResponse.getString("oauth_authorize_url");
+			
+		} catch (JSONException e) {
+			e.printStackTrace();
+			return null;
+		}
+		
+		OAuthProvider provider = getProvider();
+		
+		try {
+			// the argument is the callback used when the remote authorization is complete
+			url = provider.retrieveRequestToken(consumer, "tomdroid://sync");
+			
+			requestToken = consumer.getToken();
+			requestTokenSecret = consumer.getTokenSecret();
+			oauth10a = provider.isOAuth10a();
+			accessToken = "";
+			accessTokenSecret = "";
+			saveConfiguration();
+			
+		} catch (OAuthMessageSignerException e1) {
+			e1.printStackTrace();
+			return null;
+		} catch (OAuthNotAuthorizedException e1) {
+			e1.printStackTrace();
+			return null;
+		} catch (OAuthExpectationFailedException e1) {
+			e1.printStackTrace();
+			return null;
+		} catch (OAuthCommunicationException e1) {
+			e1.printStackTrace();
+			return null;
+		}
+		
+		if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "Authorization URL : "+url);
+		
+		return Uri.parse(url);
+	}
+	
+	public boolean getAccess(String verifier) throws UnknownHostException {
+		
+		Log.i(TAG, "Verifier: "+verifier);
+		
+		// this method shouldn't have been called
+		if (isAuthenticated())
+			return false;
+		
+		if (!requestToken.equals("") && !requestTokenSecret.equals("")) {
+			consumer.setTokenWithSecret(requestToken, requestTokenSecret);
+			if(Tomdroid.LOGGING_ENABLED) {
+				Log.d(TAG, "Added request token "+requestTokenSecret+" and request token secret "+requestTokenSecret);
+			}
+		}
+		else
+			return false;
+		
+		OAuthProvider provider = getProvider();
+		
+		try {
+			provider.retrieveAccessToken(consumer, verifier);
+		} catch (OAuthMessageSignerException e1) {
+			e1.printStackTrace();
+			return false;
+		} catch (OAuthNotAuthorizedException e1) {
+			e1.printStackTrace();
+			return false;
+		} catch (OAuthExpectationFailedException e1) {
+			e1.printStackTrace();
+			return false;
+		} catch (OAuthCommunicationException e1) {
+			e1.printStackTrace();
+			return false;
+		}
+		
+		// access has been granted, store the access token
+		accessToken = consumer.getToken();
+		accessTokenSecret = consumer.getTokenSecret();
+		requestToken = "";
+		requestTokenSecret = "";
+		
+		try {
+			JSONObject response = new JSONObject(get(rootApi));
+			// append a slash to the url, else the signature will fail
+			userApi = response.getJSONObject("user-ref").getString("api-ref");
+		} catch (JSONException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		saveConfiguration();
+		
+		if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "Got access token "+consumer.getToken()+".");
+		
+		return true;
+	}
+	
+	@Override
+	public String get(String uri) throws java.net.UnknownHostException {
+		
+		// Prepare a request object
+		HttpGet httpGet = new HttpGet(uri);
+		sign(httpGet);
+		HttpResponse response = execute(httpGet);		
+		return parseResponse(response);
+	}
+	
+	@Override
+	public String put(String uri, String data) throws UnknownHostException {
+		
+		// Prepare a request object
+		HttpPut httpPut = new HttpPut(uri);
+		
+		try {
+			// The default http content charset is ISO-8859-1, JSON requires UTF-8
+			httpPut.setEntity(new StringEntity(data, "UTF-8"));
+		} catch (UnsupportedEncodingException e1) {
+			e1.printStackTrace();
+			return null;
+		}
+		
+		httpPut.setHeader("Content-Type", "application/json");
+		sign(httpPut);
+		
+		// Do not handle redirects, we need to sign the request again as the old signature will be invalid
+		HttpResponse response = execute(httpPut);
+		return parseResponse(response);
+	}
+	
+	private void saveConfiguration() {
+		
+		Preferences.putString(Preferences.Key.ACCESS_TOKEN, accessToken);
+		Preferences.putString(Preferences.Key.ACCESS_TOKEN_SECRET, accessTokenSecret);
+		Preferences.putString(Preferences.Key.ACCESS_TOKEN_URL, accessTokenUrl);
+		Preferences.putString(Preferences.Key.REQUEST_TOKEN, requestToken);
+		Preferences.putString(Preferences.Key.REQUEST_TOKEN_SECRET, requestTokenSecret);
+		Preferences.putString(Preferences.Key.REQUEST_TOKEN_URL, requestTokenUrl);
+		Preferences.putBoolean(Preferences.Key.OAUTH_10A, oauth10a);
+		Preferences.putString(Preferences.Key.AUTHORIZE_URL, authorizeUrl);
+		Preferences.putString(Preferences.Key.SYNC_SERVER_ROOT_API, rootApi);
+		Preferences.putString(Preferences.Key.SYNC_SERVER_USER_API, userApi);
+	}
+}

=== added file 'src/org/tomdroid/sync/web/SnowySyncService.java'
--- src/org/tomdroid/sync/web/SnowySyncService.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/sync/web/SnowySyncService.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,232 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2009, Benoit Garret <[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.sync.web;
+
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.tomdroid.Note;
+import org.tomdroid.sync.ServiceAuth;
+import org.tomdroid.sync.SyncService;
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.Preferences;
+
+import android.app.Activity;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+
+public class SnowySyncService extends SyncService implements ServiceAuth {
+	
+	private static final String TAG = "SnowySyncService";
+	
+	public SnowySyncService(Activity activity, Handler handler) {
+		super(activity, handler);
+	}
+	
+	@Override
+	public String getDescription() {
+		return "Tomboy Web";
+	}
+
+	@Override
+	public String getName() {
+		return "tomboy-web";
+	}
+	
+	public boolean isConfigured() {
+		OAuthConnection auth = getAuthConnection();
+		return auth.isAuthenticated();
+	}
+
+	@Override
+	public boolean needsServer() {
+		return true;
+	}
+	
+	@Override
+	public boolean needsAuth() {
+		return true;
+	}
+	
+	public void getAuthUri(final String server, final Handler handler) {
+		
+		execInThread(new Runnable() {
+			
+			public void run() {
+				
+				// Reset the authentication credentials
+				OAuthConnection auth = new OAuthConnection();
+				Uri authUri = null;
+				
+				try {
+					authUri = auth.getAuthorizationUrl(server);
+					
+				} catch (UnknownHostException e) {
+					if (Tomdroid.LOGGING_ENABLED)
+						Log.e(TAG, "Internet connection not available");
+					sendMessage(NO_INTERNET);
+				}
+				
+				Message message = new Message();
+				message.obj = authUri;
+				handler.sendMessage(message);
+			}
+			
+		});
+	}
+	
+	public void remoteAuthComplete(final Uri uri, final Handler handler) {
+		
+		execInThread(new Runnable() {
+			
+			public void run() {
+
+				try {
+					// TODO: might be intelligent to show something like a progress dialog
+					// else the user might try to sync before the authorization process
+					// is complete
+					OAuthConnection auth = getAuthConnection();
+					boolean result = auth.getAccess(uri.getQueryParameter("oauth_verifier"));
+
+					if (Tomdroid.LOGGING_ENABLED) {
+						if (result) {
+							Log.i(TAG, "The authorization process is complete.");
+						} else
+							Log.e(TAG, "Something went wrong during the authorization process.");
+					}
+				} catch (UnknownHostException e) {
+					if (Tomdroid.LOGGING_ENABLED)
+						Log.e(TAG, "Internet connection not available");
+					sendMessage(NO_INTERNET);
+				}
+				
+				// We don't care what we send, just remove the dialog
+				handler.sendEmptyMessage(0);
+			}
+		});
+	}
+	
+	@Override
+	public boolean isSyncable(){
+		 return super.isSyncable() && isConfigured();
+	}
+	
+
+	@Override
+	protected void sync() {
+		
+		// start loading snowy notes
+		setSyncProgress(0);
+		if (Tomdroid.LOGGING_ENABLED) Log.v(TAG, "Loading Snowy notes");
+		
+		final String userRef = Preferences.getString(Preferences.Key.SYNC_SERVER_USER_API);
+		
+		execInThread(new Runnable() {
+			
+			public void run() {
+				
+				OAuthConnection auth = getAuthConnection();
+				
+				try {
+					String rawResponse = auth.get(userRef);
+					setSyncProgress(30);
+					JSONObject response = new JSONObject(rawResponse);
+					String notesUrl = response.getJSONObject("notes-ref").getString("api-ref");
+					
+					response = new JSONObject(auth.get(notesUrl));
+					
+					long latestSyncRevision = (Long)Preferences.getLong(Preferences.Key.LATEST_SYNC_REVISION);
+					setSyncProgress(35);
+					
+					if (response.getLong("latest-sync-revision") < latestSyncRevision) {
+						setSyncProgress(100);
+						return;
+					}
+					
+					response = new JSONObject(auth.get(notesUrl + "?include_notes=true"));
+					JSONArray notes = response.getJSONArray("notes");
+					setSyncProgress(60);
+					
+					// Delete the notes that are not in the database
+					ArrayList<String> remoteGuids = new ArrayList<String>();
+
+					for (int i = 0; i < notes.length(); i++) {
+						remoteGuids.add(notes.getJSONObject(i).getString("guid"));
+					}
+
+					deleteNotes(remoteGuids);
+					setSyncProgress(70);
+					
+					// Insert or update the rest of the notes
+					for (int i = 0; i < notes.length() - 1; i++) {
+
+						JSONObject jsonNote = notes.getJSONObject(i);
+						insertNote(new Note(jsonNote), false);
+					}
+					setSyncProgress(90);
+					
+					JSONObject jsonNote = notes.getJSONObject(notes.length() - 1);
+					insertNote(new Note(jsonNote), true);
+
+					Preferences.putLong(Preferences.Key.LATEST_SYNC_REVISION, response
+							.getLong("latest-sync-revision"));
+					setSyncProgress(100);
+					
+				} catch (JSONException e1) {
+					if (Tomdroid.LOGGING_ENABLED) Log.e(TAG, "Problem parsing the server response", e1);
+					sendMessage(PARSING_FAILED);
+					setSyncProgress(100);
+					return;
+				} catch (java.net.UnknownHostException e) {
+					if (Tomdroid.LOGGING_ENABLED) Log.e(TAG, "Internet connection not available");
+					sendMessage(NO_INTERNET);
+					setSyncProgress(100);
+					return;
+				}
+			}
+		});
+	}
+	
+	private OAuthConnection getAuthConnection() {
+		
+		OAuthConnection auth = new OAuthConnection();
+		
+		auth.accessToken = Preferences.getString(Preferences.Key.ACCESS_TOKEN);
+		auth.accessTokenSecret = Preferences.getString(Preferences.Key.ACCESS_TOKEN_SECRET);
+		auth.requestToken = Preferences.getString(Preferences.Key.REQUEST_TOKEN);
+		auth.requestTokenSecret = Preferences.getString(Preferences.Key.REQUEST_TOKEN_SECRET);
+		auth.oauth10a = Preferences.getBoolean(Preferences.Key.OAUTH_10A);
+		auth.authorizeUrl = Preferences.getString(Preferences.Key.AUTHORIZE_URL);
+		auth.accessTokenUrl = Preferences.getString(Preferences.Key.ACCESS_TOKEN_URL);
+		auth.requestTokenUrl = Preferences.getString(Preferences.Key.REQUEST_TOKEN_URL);
+		auth.rootApi = Preferences.getString(Preferences.Key.SYNC_SERVER_ROOT_API);
+		auth.userApi = Preferences.getString(Preferences.Key.SYNC_SERVER_USER_API);
+		
+		return auth;
+	}
+}

=== added file 'src/org/tomdroid/sync/web/WebConnection.java'
--- src/org/tomdroid/sync/web/WebConnection.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/sync/web/WebConnection.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,139 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2009, Benoit Garret <[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.sync.web;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.UnknownHostException;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.tomdroid.ui.Tomdroid;
+
+import android.util.Log;
+
+public abstract class WebConnection {
+	
+	private static final String TAG = "WebConnection";
+	
+	public abstract String get(String uri) throws UnknownHostException;
+	public abstract String put(String uri, String data) throws UnknownHostException;
+	
+	private static String convertStreamToString(InputStream is) {
+		/*
+		 * To convert the InputStream to String we use the BufferedReader.readLine()
+		 * method. We iterate until the BufferedReader return null which means
+		 * there's no more data to read. Each line will appended to a StringBuilder
+		 * and returned as String.
+		 */
+		BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+		StringBuilder sb = new StringBuilder();
+
+		String line = null;
+		try {
+			while ((line = reader.readLine()) != null) {
+				sb.append(line + "\n");
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				is.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+		return sb.toString();
+	}
+	
+	protected String parseResponse(HttpResponse response) {
+		
+		if (response == null)
+			return "";
+		
+		String result = null;
+		
+		// Examine the response status
+		if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "Response status : "+response.getStatusLine().toString());
+
+		// Get hold of the response entity
+		HttpEntity entity = response.getEntity();
+		// If the response does not enclose an entity, there is no need
+		// to worry about connection release
+
+		if (entity != null) {
+			
+			try {
+				InputStream instream;
+				
+				instream = entity.getContent();
+				
+				result = convertStreamToString(instream);
+				
+				if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "Received : "+result);
+				
+				// Closing the input stream will trigger connection release
+				instream.close();
+				
+			} catch (IllegalStateException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		return result;
+	}
+	
+	protected HttpResponse execute(HttpUriRequest request) throws UnknownHostException {
+		
+		DefaultHttpClient httpclient = new DefaultHttpClient();
+		
+		try {
+			// Execute the request
+			HttpResponse response = httpclient.execute(request);
+			return response;
+			
+		}catch (UnknownHostException e){
+			throw e;
+		} catch (ClientProtocolException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} catch (IllegalArgumentException e) {
+			e.printStackTrace();
+		} catch (IllegalStateException e) {
+			e.printStackTrace();
+		}
+		
+		return null;
+	}
+}

=== added file 'src/org/tomdroid/ui/Actionbar.java'
--- src/org/tomdroid/ui/Actionbar.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/ui/Actionbar.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,69 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2010, Rodja Trappe <[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 org.tomdroid.sync.SyncManager;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+
+public class Actionbar extends RelativeLayout {
+
+	public static final int DEFAULT_ICON_ALPHA = 200;
+
+	public Actionbar(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public Actionbar(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+	}
+
+	public Actionbar(Context context) {
+		super(context);
+	}
+
+	@Override
+	public void onFinishInflate(){
+		super.onFinishInflate();
+		setupSyncButton();
+	}
+	
+	private void setupSyncButton(){
+		
+		final ImageView syncButton = (ImageView) findViewById(R.id.sync);
+		final ImageView syncIcon = (ImageView) findViewById(R.id.syncIcon);
+		syncIcon.getDrawable().setAlpha(Actionbar.DEFAULT_ICON_ALPHA);
+		syncButton.setOnClickListener(new View.OnClickListener() {
+
+			public void onClick(View v) {
+				SyncManager.getInstance().startSynchronization();
+			}
+		});
+	}
+	
+}

=== added file 'src/org/tomdroid/ui/PreferencesActivity.java'
--- src/org/tomdroid/ui/PreferencesActivity.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/ui/PreferencesActivity.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,217 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2009, Benoit Garret <[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 java.util.ArrayList;
+
+import org.tomdroid.R;
+import org.tomdroid.sync.ServiceAuth;
+import org.tomdroid.sync.SyncManager;
+import org.tomdroid.sync.SyncService;
+import org.tomdroid.util.Preferences;
+
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.DialogInterface.OnClickListener;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.EditTextPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.util.Log;
+import android.widget.Toast;
+
+public class PreferencesActivity extends PreferenceActivity {
+	
+	private static final String TAG = "PreferencesActivity";
+	
+	// TODO: put the various preferences in fields and figure out what to do on activity suspend/resume
+	private EditTextPreference syncServer = null;
+	private ListPreference syncService = null;
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		
+		super.onCreate(savedInstanceState);
+		addPreferencesFromResource(R.xml.preferences);
+		
+		// Fill the Preferences fields
+		syncServer = (EditTextPreference)findPreference(Preferences.Key.SYNC_SERVER.getName());
+		syncService = (ListPreference)findPreference(Preferences.Key.SYNC_SERVICE.getName());
+		
+		// Set the default values if nothing exists
+		this.setDefaults();
+		
+		// Fill the services combo list
+		this.fillServices();
+		
+		// Enable or disable the server field depending on the selected sync service
+		setServer(syncService.getValue());
+		
+		syncService.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+			
+			public boolean onPreferenceChange(Preference preference, Object newValue) {
+				
+				setServer((String)newValue);
+				return true;
+			}
+		});
+		
+		// Re-authenticate if the sync server changes
+		syncServer.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+
+			public boolean onPreferenceChange(Preference preference,
+					Object serverUri) {
+				
+				if (serverUri == null) {
+					Toast.makeText(PreferencesActivity.this,
+							getString(R.string.prefServerEmpty),
+							Toast.LENGTH_SHORT).show();
+					return false;
+				}
+			    
+				authenticate((String) serverUri);
+				return true;
+			}
+			
+		});
+		
+	}
+	
+	private void authenticate(String serverUri) {
+
+		// update the value before doing anything
+		Preferences.putString(Preferences.Key.SYNC_SERVER, serverUri);
+
+		SyncService currentService = SyncManager.getInstance().getCurrentService();
+
+		if (!currentService.needsAuth()) {
+			return;
+		}
+
+		// service needs authentication
+		Log.i(TAG, "Creating dialog");
+
+		final ProgressDialog authProgress = ProgressDialog.show(this, "",
+				"Authenticating. Please wait...", true, false);
+
+		Handler handler = new Handler() {
+
+			@Override
+			public void handleMessage(Message msg) {
+
+				boolean wasSuccsessful = false;
+				Uri authorizationUri = (Uri) msg.obj;
+				if (authorizationUri != null) {
+
+					Intent i = new Intent(Intent.ACTION_VIEW, authorizationUri);
+					startActivity(i);
+					wasSuccsessful = true;
+
+				} else {
+					// Auth failed, don't update the value
+					wasSuccsessful = false;
+				}
+
+				if (authProgress != null)
+					authProgress.dismiss();
+
+				if (wasSuccsessful) {
+					resetLocalDatabase();
+				} else {
+					connectionFailed();
+				}
+			}
+		};
+
+		((ServiceAuth) currentService).getAuthUri(serverUri, handler);
+	}
+	
+	private void fillServices()
+	{
+		ArrayList<SyncService> availableServices = SyncManager.getInstance().getServices();
+		CharSequence[] entries = new CharSequence[availableServices.size()];
+		CharSequence[] entryValues = new CharSequence[availableServices.size()];
+		
+		for (int i = 0; i < availableServices.size(); i++) {
+			entries[i] = availableServices.get(i).getDescription();
+			entryValues[i] = availableServices.get(i).getName();
+		}
+		
+		syncService.setEntries(entries);
+		syncService.setEntryValues(entryValues);
+	}
+	
+	private void setDefaults()
+	{
+		String defaultServer = (String)Preferences.Key.SYNC_SERVER.getDefault();
+		syncServer.setDefaultValue(defaultServer);
+		if(syncServer.getText() == null)
+			syncServer.setText(defaultServer);
+
+		String defaultService = (String)Preferences.Key.SYNC_SERVICE.getDefault();
+		syncService.setDefaultValue(defaultService);
+		if(syncService.getValue() == null)
+			syncService.setValue(defaultService);
+	
+	}
+
+	private void setServer(String syncServiceKey) {
+
+		SyncService service = SyncManager.getInstance().getService(syncServiceKey);
+
+		if (service == null)
+			return;
+
+		if (!service.needsAuth()){
+			resetLocalDatabase();
+		}
+		
+		syncServer.setEnabled(service.needsServer());
+		syncService.setSummary(service.getDescription());
+
+	}
+		
+	private void connectionFailed() {
+		new AlertDialog.Builder(this)
+			.setMessage(getString(R.string.prefSyncConnectionFailed))
+			.setNeutralButton(getString(R.string.btnOk), new OnClickListener() {
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+				}})
+			.show();
+	}
+
+	//TODO use LocalStorage wrapper from two-way-sync branch when it get's merged
+	private void resetLocalDatabase() {
+		getContentResolver().delete(Tomdroid.CONTENT_URI, null, null);
+		Preferences.putLong(Preferences.Key.LATEST_SYNC_REVISION, 0);
+	}
+
+}

=== added file 'src/org/tomdroid/ui/SyncMessageHandler.java'
--- src/org/tomdroid/ui/SyncMessageHandler.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/ui/SyncMessageHandler.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,158 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2010, Rodja Trappe <[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 org.tomdroid.sync.SyncManager;
+import org.tomdroid.sync.SyncService;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.view.animation.RotateAnimation;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+public class SyncMessageHandler extends Handler {
+
+	private static String TAG = "SycnMessageHandler";
+	private Activity activity;
+
+	// State variables
+	private boolean parsingErrorShown = false;
+	
+	public SyncMessageHandler(Activity activity) {
+		this.activity = activity;
+	}
+
+	@Override
+	public void handleMessage(Message msg) {
+
+		switch (msg.what) {
+			case SyncService.PARSING_COMPLETE:
+				// TODO put string in a translatable bundle
+				Toast.makeText(
+						activity,
+						"Synchronization with "
+								+ SyncManager.getInstance().getCurrentService().getDescription()
+								+ " is complete.", Toast.LENGTH_SHORT).show();
+				break;
+
+			case SyncService.PARSING_NO_NOTES:
+				// TODO put string in a translatable bundle
+				Toast.makeText(
+						activity,
+						"No notes found on "
+								+ SyncManager.getInstance().getCurrentService().getDescription()
+								+ ".", Toast.LENGTH_SHORT).show();
+				break;
+
+			case SyncService.PARSING_FAILED:
+				if (Tomdroid.LOGGING_ENABLED)
+					Log.w(TAG, "handler called with a parsing failed message");
+
+				// if we already shown a parsing error in this pass, we
+				// won't show it again
+				if (!parsingErrorShown) {
+					parsingErrorShown = true;
+
+					// TODO put error string in a translatable resource
+					new AlertDialog.Builder(activity).setMessage(
+							"There was an error trying to parse your note collection. If "
+									+ "you are able to replicate the problem, please contact us!")
+							.setTitle("Error").setNeutralButton("Ok", new OnClickListener() {
+								public void onClick(DialogInterface dialog, int which) {
+									dialog.dismiss();
+								}
+							}).show();
+				}
+				break;
+
+			case SyncService.NO_INTERNET:
+				// TODO put string in a translatable bundle
+				Toast.makeText(activity, "You are not connected to the internet.",
+						Toast.LENGTH_SHORT).show();
+				break;
+
+			case SyncService.SYNC_PROGRESS:
+				handleSyncProgress(msg);
+				break;
+
+			default:
+				if (Tomdroid.LOGGING_ENABLED)
+					Log.i(TAG, "handler called with an unknown message");
+				break;
+
+		}
+	}
+
+	private void handleSyncProgress(Message msg) {
+		ImageView syncIcon = (ImageView) activity.findViewById(R.id.syncIcon);
+
+		RotateAnimation rotation = new RotateAnimation(180 * msg.arg2 / 100f,
+				180 * msg.arg1 / 100f, Animation.RELATIVE_TO_SELF, 0.5f,
+				Animation.RELATIVE_TO_SELF, 0.5f);
+		rotation.setDuration(700);
+		rotation.setFillAfter(true);
+		syncIcon.startAnimation(rotation);
+
+		if (msg.arg1 == 0) {
+			onSynchronizationStarted();
+		} else if (msg.arg1 == 100) {
+			onSynchronizationDone();
+		}
+	}
+
+	private void onSynchronizationDone() {
+		ImageView syncButton = (ImageView) activity.findViewById(R.id.sync);
+		ImageView syncIcon = (ImageView) activity.findViewById(R.id.syncIcon);
+
+		syncButton.setClickable(true);
+		syncIcon.getDrawable().setAlpha(Actionbar.DEFAULT_ICON_ALPHA);
+
+		View dot = activity.findViewById(R.id.sync_dot);
+		dot.setVisibility(View.INVISIBLE);
+		dot.getAnimation().setRepeatCount(0);
+	}
+
+	private void onSynchronizationStarted() {
+		ImageView syncButton = (ImageView) activity.findViewById(R.id.sync);
+		ImageView syncIcon = (ImageView) activity.findViewById(R.id.syncIcon);
+
+		syncButton.setClickable(false);
+		syncIcon.getDrawable().setAlpha(40);
+		
+		Animation pulse = AnimationUtils.loadAnimation(activity, R.anim.pulse);
+		View dot = activity.findViewById(R.id.sync_dot);
+		dot.setVisibility(View.VISIBLE);
+		dot.startAnimation(pulse);
+	}
+
+}

=== modified file 'src/org/tomdroid/ui/Tomdroid.java'
--- src/org/tomdroid/ui/Tomdroid.java	2010-02-16 05:18:09 +0000
+++ src/org/tomdroid/ui/Tomdroid.java	2010-10-03 12:21:44 +0000
@@ -3,7 +3,9 @@
  * Tomboy on Android
  * http://www.launchpad.net/tomdroid
  * 
- * Copyright 2008, 2009, 2010 Olivier Bilodeau <[e-mail]>
+ * Copyright 2009, 2010 Olivier Bilodeau <[e-mail]>
+ * Copyright 2009, Benoit Garret <[e-mail]>
+ * Copyright 2010, Rodja Trappe <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -22,16 +24,17 @@
  */
 package org.tomdroid.ui;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-
 import org.tomdroid.Note;
 import org.tomdroid.NoteManager;
 import org.tomdroid.R;
-import org.tomdroid.util.AsyncNoteLoaderAndParser;
+import org.tomdroid.sync.ServiceAuth;
+import org.tomdroid.sync.SyncManager;
+import org.tomdroid.sync.SyncService;
+import org.tomdroid.util.Preferences;
 
 import android.app.AlertDialog;
 import android.app.ListActivity;
+import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.DialogInterface.OnClickListener;
@@ -39,6 +42,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
@@ -49,136 +53,127 @@
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 public class Tomdroid extends ListActivity {
 
 	// Global definition for Tomdroid
-	public static final String AUTHORITY = "org.tomdroid.notes";
-	public static final Uri	CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/notes");
-    public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.tomdroid.note";
-    public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.tomdroid.note";
-    public static final String PROJECT_HOMEPAGE = "http://www.launchpad.net/tomdroid/";
-	
+	public static final String	AUTHORITY			= "org.tomdroid.notes";
+	public static final Uri		CONTENT_URI			= Uri
+															.parse("content://" + AUTHORITY
+																	+ "/notes");
+	public static final String	CONTENT_TYPE		= "vnd.android.cursor.dir/vnd.tomdroid.note";
+	public static final String	CONTENT_ITEM_TYPE	= "vnd.android.cursor.item/vnd.tomdroid.note";
+	public static final String	PROJECT_HOMEPAGE	= "http://www.launchpad.net/tomdroid/";
+
 	// config parameters
 	// TODO hardcoded for now
-	public static final String NOTES_PATH = "/sdcard/tomdroid/";
+	public static final String	NOTES_PATH			= Environment.getExternalStorageDirectory()
+															+ "/tomdroid/";
 	// Logging should be disabled for release builds
-	public static final boolean LOGGING_ENABLED = false;
+	public static final boolean	LOGGING_ENABLED		= false;
+	// Set this to false for release builds, the reason should be obvious
+	public static final boolean	CLEAR_PREFERENCES	= false;
 
 	// Logging info
-	private static final String TAG = "Tomdroid";
-	
+	private static final String	TAG					= "Tomdroid";
+
 	// UI to data model glue
-	private TextView listEmptyView;
-	private ListAdapter adapter;
-	
-	// Bundle keys for saving state
-	private static final String WARNING_SHOWN = "w";
-	
-	// State variables
-	private boolean warningShown = false;
-	private boolean parsingErrorShown = false;
-
-	
-    /** Called when the activity is created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        setContentView(R.layout.main);
-        
-        // did we already show the warning and got destroyed by android's activity killer?
-        if (savedInstanceState == null || !savedInstanceState.getBoolean(WARNING_SHOWN)) {
-
-        	// Warn that this is a "will eat your babies" release 
-			new AlertDialog.Builder(this)
-				.setMessage(getString(R.string.strWelcome))
-				.setTitle("Warning")
-				.setNeutralButton("Ok", new OnClickListener() {
-					public void onClick(DialogInterface dialog, int which) {
-						warningShown = true;
-						dialog.dismiss();
-					}})
-				.setIcon(R.drawable.icon)
-				.show();
-        }
-        
-        // adapter that binds the ListView UI to the notes in the note manager
-        adapter = NoteManager.getListAdapter(this);
+	private TextView			listEmptyView;
+	private ListAdapter			adapter;
+
+	// UI feedback handler
+	private Handler	syncMessageHandler	= new SyncMessageHandler(this);
+	
+	/** Called when the activity is created. */
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.main);
+		Preferences.init(this, CLEAR_PREFERENCES);
+
+		// did we already show the warning and got destroyed by android's activity killer?
+		if (Preferences.getBoolean(Preferences.Key.FIRST_RUN)) {
+
+			// Warn that this is a "will eat your babies" release
+			new AlertDialog.Builder(this).setMessage(getString(R.string.strWelcome)).setTitle(
+					"Warning").setNeutralButton("Ok", new OnClickListener() {
+				public void onClick(DialogInterface dialog, int which) {
+					Preferences.putBoolean(Preferences.Key.FIRST_RUN, false);
+					dialog.dismiss();
+				}
+			}).setIcon(R.drawable.icon).show();
+		}
+
+		// adapter that binds the ListView UI to the notes in the note manager
+		adapter = NoteManager.getListAdapter(this);
 		setListAdapter(adapter);
 
-        // set the view shown when the list is empty
+		// set the view shown when the list is empty
 		// TODO default empty-list text is butt-ugly!
-        listEmptyView = (TextView)findViewById(R.id.list_empty);
-        getListView().setEmptyView(listEmptyView);
-    }
+		listEmptyView = (TextView) findViewById(R.id.list_empty);
+		getListView().setEmptyView(listEmptyView);
+	}
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 
 		// Create the menu based on what is defined in res/menu/main.xml
-	    MenuInflater inflater = getMenuInflater();
-	    inflater.inflate(R.menu.main, menu);
-	    return true;
+		MenuInflater inflater = getMenuInflater();
+		inflater.inflate(R.menu.main, menu);
+		return true;
+
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-	        case R.id.menuSyncWithSD:
-
-	        	// start loading local notes
-                if (LOGGING_ENABLED) Log.v(TAG, "Loading local notes");
-        		// reset parsing error flag
-        		parsingErrorShown = false;
-
-            	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(handler);
-        		
-	    		} catch (FileNotFoundException e) {
-	    			//TODO put strings in an external resource
-	    			listEmptyView.setText(R.string.strListEmptyNoNotes);
-	    			new AlertDialog.Builder(this)
-	    				.setMessage(e.getMessage())
-	    				.setTitle("Error")
-	    				.setNeutralButton("Ok", new OnClickListener() {
-	    					public void onClick(DialogInterface dialog, int which) {
-	    						dialog.dismiss();
-	    					}})
-	    				.show();
-	    			e.printStackTrace();
-	    		}
-        	
-	    		return true;
-	        
-	        case R.id.menuAbout:
+		switch (item.getItemId()) {
+			case R.id.menuAbout:
 				showAboutDialog();
-	        	return true;
-        }
-        
-        return super.onOptionsItemSelected(item);
+				return true;
+
+			case R.id.menuPrefs:
+				startActivity(new Intent(this, PreferencesActivity.class));
+				return true;
+		}
+
+		return super.onOptionsItemSelected(item);
 	}
 
-	@Override
-	protected void onSaveInstanceState(Bundle outState) {
-		super.onSaveInstanceState(outState);
+	public void onResume() {
+		super.onResume();
+		Intent intent = this.getIntent();
+
+		SyncService currentService = SyncManager.getInstance().getCurrentService();
 		
-		// saving the state of the warning dialog
-		if (warningShown) {
-			outState.putBoolean(WARNING_SHOWN, true);
+		if (currentService.needsAuth() && intent != null) {
+			Uri uri = intent.getData();
+
+			if (uri != null && uri.getScheme().equals("tomdroid")) {
+				Log.i(TAG, "Got url : " + uri.toString());
+
+				final ProgressDialog dialog = ProgressDialog.show(this, "",
+						"Completing authentication. Please wait...", true, false);
+
+				Handler handler = new Handler() {
+
+					@Override
+					public void handleMessage(Message msg) {
+						dialog.dismiss();
+					}
+
+				};
+
+				((ServiceAuth) currentService).remoteAuthComplete(uri, handler);
+			}
 		}
+		
+		SyncManager.setActivity(this);
+		SyncManager.setHandler(this.syncMessageHandler);
 	}
 
 	private void showAboutDialog() {
-		
+
 		// grab version info
 		String ver;
 		try {
@@ -187,90 +182,38 @@
 			e.printStackTrace();
 			ver = "Not found!";
 		}
-		
+
 		// format the string
 		String aboutDialogFormat = getString(R.string.strAbout);
-		String aboutDialogStr = String.format(aboutDialogFormat, 
-				getString(R.string.app_desc), 	// App description
-				getString(R.string.author), 	// Author name
-				ver							// Version
+		String aboutDialogStr = String.format(aboutDialogFormat, getString(R.string.app_desc), // App description
+				getString(R.string.author), // Author name
+				ver // Version
 				);
-		
+
 		// build and show the dialog
-		new AlertDialog.Builder(this)
-			.setMessage(aboutDialogStr)
-			.setTitle("About Tomdroid")
-			.setIcon(R.drawable.icon)
-			.setNegativeButton("Project page", new OnClickListener() {
-				public void onClick(DialogInterface dialog,	int which) {
-					startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Tomdroid.PROJECT_HOMEPAGE)));
-					dialog.dismiss();
-				}})
-			.setPositiveButton("Ok", new OnClickListener() {
-				public void onClick(DialogInterface dialog,	int which) {
-					dialog.dismiss();
-				}})
-			.show();
+		new AlertDialog.Builder(this).setMessage(aboutDialogStr).setTitle("About Tomdroid")
+				.setIcon(R.drawable.icon).setNegativeButton("Project page", new OnClickListener() {
+					public void onClick(DialogInterface dialog, int which) {
+						startActivity(new Intent(Intent.ACTION_VIEW, Uri
+								.parse(Tomdroid.PROJECT_HOMEPAGE)));
+						dialog.dismiss();
+					}
+				}).setPositiveButton("Ok", new OnClickListener() {
+					public void onClick(DialogInterface dialog, int which) {
+						dialog.dismiss();
+					}
+				}).show();
 	}
 
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
-		
-		Cursor item = (Cursor)adapter.getItem(position);
+
+		Cursor item = (Cursor) adapter.getItem(position);
 		int noteId = item.getInt(item.getColumnIndexOrThrow(Note.ID));
-		
-		Uri intentUri = Uri.parse(Tomdroid.CONTENT_URI+"/"+noteId);
+
+		Uri intentUri = Uri.parse(Tomdroid.CONTENT_URI + "/" + noteId);
 		Intent i = new Intent(Intent.ACTION_VIEW, intentUri, this, ViewNote.class);
 		startActivity(i);
 	}
-	
-    private Handler handler = new Handler() {
-
-        @Override
-        public void handleMessage(Message msg) {
-
-        	switch(msg.what) {
-        	case AsyncNoteLoaderAndParser.PARSING_COMPLETE:
-        		// TODO put string in a translatable bundle
-        		Toast.makeText(getApplicationContext(),
-        				"Synchronization with SD Card is complete.",
-        				Toast.LENGTH_SHORT)
-        				.show();
-        		break;
-        		
-        	case AsyncNoteLoaderAndParser.PARSING_NO_NOTES:
-    			// TODO put string in a translatable bundle
-    			Toast.makeText(getApplicationContext(),
-    					"There are no files in tomdroid/ on the sdcard.",
-    					Toast.LENGTH_SHORT)
-    					.show();
-    			break;
-
-        	case AsyncNoteLoaderAndParser.PARSING_FAILED:
-        		if (Tomdroid.LOGGING_ENABLED) Log.w(TAG,"handler called with a parsing failed message");
-        		
-        		// if we already shown a parsing error in this pass, we won't show it again
-        		if (!parsingErrorShown) {
-	        		parsingErrorShown = true;
-
-	        		// TODO put error string in a translatable resource
-					new AlertDialog.Builder(Tomdroid.this)
-						.setMessage("There was an error trying to parse your note collection. If " +
-								    "you are able to replicate the problem, please contact us!")
-						.setTitle("Error")
-						.setNeutralButton("Ok", new OnClickListener() {
-							public void onClick(DialogInterface dialog, int which) {
-								dialog.dismiss();
-							}})
-						.show();
-        		}
-        		break;
-        		
-        	default:
-        		if (Tomdroid.LOGGING_ENABLED) Log.i(TAG,"handler called with an unknown message");
-        		break;
-        	
-        	}
-        }
-    };
+
 }

=== modified file 'src/org/tomdroid/ui/ViewNote.java'
--- src/org/tomdroid/ui/ViewNote.java	2010-02-06 14:57:07 +0000
+++ src/org/tomdroid/ui/ViewNote.java	2010-10-03 12:21:44 +0000
@@ -4,6 +4,7 @@
  * http://www.launchpad.net/tomdroid
  * 
  * Copyright 2008, 2009, 2010 Olivier Bilodeau <[e-mail]>
+ * Copyright 2009, Benoit Garret <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -28,6 +29,7 @@
 import org.tomdroid.Note;
 import org.tomdroid.NoteManager;
 import org.tomdroid.R;
+import org.tomdroid.sync.SyncManager;
 import org.tomdroid.util.LinkifyPhone;
 import org.tomdroid.util.NoteContentBuilder;
 
@@ -37,6 +39,7 @@
 import android.content.Intent;
 import android.content.DialogInterface.OnClickListener;
 import android.database.Cursor;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -52,6 +55,7 @@
 public class ViewNote extends Activity {
 	
 	// UI elements
+	private TextView title;
 	private TextView content;
 	
 	// Model objects
@@ -61,6 +65,9 @@
 	// Logging info
 	private static final String TAG = "ViewNote";
 	
+	// UI feedback handler
+	private Handler	syncMessageHandler	= new SyncMessageHandler(this);
+
 	// TODO extract methods in here
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -68,6 +75,14 @@
 		
 		setContentView(R.layout.note_view);
 		content = (TextView) findViewById(R.id.content);
+		content.setBackgroundColor(0xffffffff);
+		content.setTextColor(Color.DKGRAY);
+		content.setTextSize(18.0f);
+		title = (TextView) findViewById(R.id.title);
+		title.setBackgroundColor(0xffdddddd);
+		title.setTextColor(Color.DKGRAY);
+		title.setTextSize(18.0f);
+		
 		final Intent intent = getIntent();
 		Uri uri = intent.getData();
 		
@@ -84,7 +99,9 @@
 			
 			if(note != null) {
 				
-				noteContent = note.getNoteContent(handler);
+				noteContent = note.getNoteContent(noteContentHandler);
+				
+				//Log.i(TAG, "THE NOTE IS: " + note.getXmlContent().toString());
 				
 			} else {
 				
@@ -120,6 +137,13 @@
 		}
 	}
 	
+	@Override
+	public void onResume(){
+		super.onResume();
+		SyncManager.setActivity(this);
+		SyncManager.setHandler(this.syncMessageHandler);
+	}
+
 	// TODO add a menu that switches the view to an EditText instead of TextView
 	// this will need some other quit mechanism as onKeyDown though.. (but the back key might do it)
 	
@@ -132,9 +156,9 @@
 		
 		return true;
 	}
-
+	
 	private void showNote() {
-		setTitle(note.getTitle());
+		//setTitle(note.getTitle());
 
 		// get rid of the title that is doubled in the note's content
 		// using quote to escape potential regexp chars in pattern
@@ -147,6 +171,7 @@
 		
 		// show the note (spannable makes the TextView able to output styled text)
 		content.setText(noteContent, TextView.BufferType.SPANNABLE);
+		title.setText((CharSequence) note.getTitle());
 		
 		// add links to stuff that is understood by Android except phone numbers because it's too aggressive
 		// TODO this is SLOWWWW!!!!
@@ -165,7 +190,14 @@
 						 noteTitleTransformFilter);
 	}
 	
-	private Handler handler = new Handler() {
+	public void setTitle(CharSequence title){
+		super.setTitle(title);
+		// temporary setting title of actionbar until we have a better idea
+		TextView titleView = (TextView) findViewById(R.id.title);
+		titleView.setText(title);
+	}
+	
+	private Handler noteContentHandler = new Handler() {
 
 		@Override
 		public void handleMessage(Message msg) {

=== modified file 'src/org/tomdroid/util/NoteContentBuilder.java'
--- src/org/tomdroid/util/NoteContentBuilder.java	2010-01-23 04:43:26 +0000
+++ src/org/tomdroid/util/NoteContentBuilder.java	2010-10-03 12:21:44 +0000
@@ -62,7 +62,8 @@
 	
 	public NoteContentBuilder setInputSource(String nc) {
 		
-		noteContentIs = new InputSource(new StringReader(nc));
+		String noteContent = "<note-content>"+nc+"</note-content>";
+		noteContentIs = new InputSource(new StringReader(noteContent));
 		return this;
 	}
 	

=== added file 'src/org/tomdroid/util/NoteListCursorAdapter.java'
--- src/org/tomdroid/util/NoteListCursorAdapter.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/util/NoteListCursorAdapter.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,113 @@
+package org.tomdroid.util;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+import android.text.format.DateUtils;
+import android.text.format.Time;
+import org.tomdroid.Note;
+import org.tomdroid.R;
+import org.tomdroid.ui.Tomdroid;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.Color;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Filterable;
+import android.widget.SimpleCursorAdapter;
+import android.widget.TextView;
+
+/* Provides a custom ListView layout for Note List */
+
+public class NoteListCursorAdapter extends SimpleCursorAdapter {
+
+    private Context context;
+
+    private int layout;
+    private int[] colors = new int[] { 0xFFFFFFFF, 0xFFEEEEEE };
+
+    private DateFormat localeDateFormat;
+    private DateFormat localeTimeFormat;
+
+    public NoteListCursorAdapter (Context context, int layout, Cursor c, String[] from, int[] to) {
+        super(context, layout, c, from, to);
+        this.context = context;
+        this.layout = layout;
+        localeDateFormat = DateFormat.getDateInstance(DateFormat.SHORT);
+        localeTimeFormat = DateFormat.getTimeInstance(DateFormat.SHORT);
+    }
+    
+
+    @Override
+    public View newView(Context context, Cursor cursor, ViewGroup parent) {
+
+        Cursor c = getCursor();
+
+        final LayoutInflater inflater = LayoutInflater.from(context);
+        View v = inflater.inflate(layout, parent, false);
+
+        populateFields(v, c);
+
+        return v;
+    }
+
+    @Override
+    public void bindView(View v, Context context, Cursor c) {
+
+        populateFields(v, c);
+    }
+    
+    @Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+    	View view = super.getView(position, convertView, parent);
+    	int colorPos = position % colors.length;
+    	view.setBackgroundColor(colors[colorPos]);
+    	//view.setTextColor(Color.DKGRAY);
+    	return view;
+	}
+    
+    private void populateFields(View v, Cursor c){
+
+        int nameCol = c.getColumnIndex(Note.TITLE);
+        int modifiedCol = c.getColumnIndex(Note.MODIFIED_DATE);
+        
+        String title = c.getString(nameCol);
+        
+        //Format last modified dates to be similar to desktop Tomboy
+        //TODO this is messy - must be a better way than having 3 separate date types
+        Time lastModified = new Time();
+        lastModified.parse3339(c.getString(modifiedCol));
+        Long lastModifiedMillis = lastModified.toMillis(false);
+        Date lastModifiedDate = new Date(lastModifiedMillis);
+        
+        String strModified = "Modified: ";
+        //TODO this is very inefficient
+        if (DateUtils.isToday(lastModifiedMillis)){
+        	strModified += "Today, " + localeTimeFormat.format(lastModifiedDate);
+        } else {
+        	// Add a day to the last modified date - if the date is now today, it means the note was edited yesterday
+        	Time yesterdayTest = lastModified;
+        	yesterdayTest.monthDay += 1;
+        	if (DateUtils.isToday(yesterdayTest.toMillis(false))){
+        		strModified += "Yesterday, " + localeTimeFormat.format(lastModifiedDate);
+        	} else {
+        		strModified += localeDateFormat.format(lastModifiedDate) + ", " + localeTimeFormat.format(lastModifiedDate);
+        	}
+        }
+
+        /**
+         * Next set the name of the entry.
+         */
+        TextView note_title = (TextView) v.findViewById(R.id.note_title);
+        if (note_title != null) {
+        	note_title.setText(title);
+        }
+        TextView note_modified = (TextView) v.findViewById(R.id.note_date);
+        if (note_modified != null) {
+        	note_modified.setText(strModified);
+        }
+    }
+
+}

=== added file 'src/org/tomdroid/util/Preferences.java'
--- src/org/tomdroid/util/Preferences.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/util/Preferences.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,112 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2009, Benoit Garret <[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;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+public class Preferences {
+	
+	public enum Key {
+		SYNC_SERVICE ("sync_service", "sdcard"),
+		SYNC_SERVER_ROOT_API ("sync_server_root_api", ""),
+		SYNC_SERVER_USER_API ("sync_server_user_api", ""),
+		SYNC_SERVER ("sync_server", "https://one.ubuntu.com/notes"),
+		ACCESS_TOKEN ("access_token", ""),
+		ACCESS_TOKEN_SECRET ("access_token_secret", ""),
+		REQUEST_TOKEN ("request_token", ""),
+		REQUEST_TOKEN_SECRET ("request_token_secret", ""),
+		OAUTH_10A ("oauth_10a", false),
+		AUTHORIZE_URL ("authorize_url", ""),
+		ACCESS_TOKEN_URL ("access_token_url", ""),
+		REQUEST_TOKEN_URL ("request_token_url", ""),
+		LATEST_SYNC_REVISION ("latest_sync_revision", 0L),
+		SORT_ORDER ("sort_order", "sort_date"),
+		FIRST_RUN ("first_run", true);
+		
+		private String name = "";
+		private Object defaultValue = "";
+		
+		Key(String name, Object defaultValue) {
+			this.name = name;
+			this.defaultValue = defaultValue;
+		}
+		
+		public String getName() {
+			return name;
+		}
+		
+		public Object getDefault() {
+			return defaultValue;
+		}
+	}
+	
+	private static SharedPreferences client = null;
+	private static SharedPreferences.Editor editor = null;
+	
+	public static void init(Context context, boolean clean) {
+		
+		client = PreferenceManager.getDefaultSharedPreferences(context);
+		editor = client.edit();
+		
+		if (clean)
+			editor.clear().commit();
+	}
+	
+	public static String getString(Key key) {
+		
+		return client.getString(key.getName(), (String) key.getDefault());
+	}
+	
+	public static void putString(Key key, String value) {
+		
+		if (value == null)
+			editor.putString(key.getName(), (String)key.getDefault());
+		else
+			editor.putString(key.getName(), value);
+		editor.commit();
+	}
+	
+	public static long getLong(Key key) {
+		
+		return client.getLong(key.getName(), (Long)key.getDefault());
+	}
+	
+	public static void putLong(Key key, long value) {
+		
+		editor.putLong(key.getName(), value);
+		editor.commit();
+	}
+	
+	public static boolean getBoolean(Key key) {
+		
+		return client.getBoolean(key.getName(), (Boolean)key.getDefault());
+	}
+	
+	public static void putBoolean(Key key, boolean value) {
+		
+		editor.putBoolean(key.getName(), value);
+		editor.commit();
+	}
+}

=== added file 'src/org/tomdroid/util/XmlUtils.java'
--- src/org/tomdroid/util/XmlUtils.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/util/XmlUtils.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,58 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ * 
+ * Copyright 2009, Benoit Garret <[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 XmlUtils {
+	
+	/**
+	 * Useful to replace the characters forbidden in xml by their escaped counterparts
+	 * Ex: &amp; -> &amp;amp;
+	 * 
+	 * @param input the string to escape
+	 * @return the escaped string
+	 */
+	public static String escape(String input) {
+		return input
+			.replace("&", "&amp;")
+			.replace("<", "&lt;")
+			.replace(">", "&gt;")
+			.replace("\"", "&quot;")
+			.replace("\'", "&apos;");
+	}
+	
+	/**
+	 * Useful to replace the escaped characters their unescaped counterparts
+	 * Ex: &amp;amp; -> &amp;
+	 * 
+	 * @param input the string to unescape
+	 * @return the unescaped string
+	 */
+	public static String unescape(String input) {
+		return input
+			.replace("&amp;", "&")
+			.replace("&lt;", "<")
+			.replace("&gt;", ">")
+			.replace("&quot;", "\"")
+			.replace("&apos;", "\'");
+	}
+}

=== modified file 'src/org/tomdroid/xml/NoteContentHandler.java'
--- src/org/tomdroid/xml/NoteContentHandler.java	2010-02-01 05:11:47 +0000
+++ src/org/tomdroid/xml/NoteContentHandler.java	2010-10-03 12:21:44 +0000
@@ -4,6 +4,7 @@
  * http://www.launchpad.net/tomdroid
  * 
  * Copyright 2008, 2009, 2010 Olivier Bilodeau <[e-mail]>
+ * Copyright 2009, Benoit Garret <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 

=== added directory 'tests'
=== added directory 'tests/org'
=== added directory 'tests/org/tomdroid'
=== added file 'tests/org/tomdroid/NoteManagerTest.java'
--- tests/org/tomdroid/NoteManagerTest.java	1970-01-01 00:00:00 +0000
+++ tests/org/tomdroid/NoteManagerTest.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,74 @@
+package org.tomdroid;
+
+import org.json.JSONObject;
+import org.tomdroid.Note;
+import org.tomdroid.NoteManager;
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.Preferences;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.test.ActivityUnitTestCase;
+
+public class NoteManagerTest extends ActivityUnitTestCase<Tomdroid> {
+	
+	public NoteManagerTest() {
+		super(Tomdroid.class);
+	}
+
+	public void testGetAllNotes() throws Exception {
+		Activity activity = getActivity();
+		putNotes(activity);
+		Cursor cursor;
+		// Get all notes excluding the notebook template ones.
+		cursor = NoteManager.getAllNotes(activity, false);
+		assertEquals(1, cursor.getCount());
+		
+		// Get all notes, including notebook templates this time.
+		cursor = NoteManager.getAllNotes(activity, true);
+		assertEquals(2, cursor.getCount());
+	}
+
+	private void putNotes(Activity a) throws Exception {
+		// Add a regular note to the content manager.
+		JSONObject note = new JSONObject(
+				"{'title': 'foo', 'note-content': 'bar', " +
+				"'guid': '002e91a2-2e34-4e2d-bf88-21def49a7704', " +
+				"'last-change-date': '2009-04-19T21:29:23.2197340-07:00', " +
+				"'tags': ['tag1', 'tag2']}");
+		Note n = new Note(note);
+		NoteManager.putNote(a, n);
+		
+		// Add a notebook template to the content manager.
+		JSONObject template = new JSONObject(
+				"{'title': 'foo', 'note-content': 'bar', " +
+				"'guid': '992e91a2-2e34-4e2d-bf88-21def49a7712', " +
+				"'last-change-date': '2009-04-19T21:29:23.2197340-07:00', " +
+				"'tags': ['system:template', 'tag2']}");
+		Note t = new Note(template);
+		NoteManager.putNote(a, t);
+	}
+		
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		// XXX: For some reason this will raise an 
+		// "Unable to add window -- token null is not for an application"
+		// error when you run the test after wiping user data from the emulator.
+		// The error is actually raised when we try to display the AlertDialog that
+		// is shown the first time the user runs tomdroid.
+		startActivity(new Intent(), null, null);
+		// XXX: Soon we'll be able to replace the two lines below with LocalStorage.resetDatabase().
+		getActivity().getContentResolver().delete(Tomdroid.CONTENT_URI, null, null);
+		Preferences.putLong(Preferences.Key.LATEST_SYNC_REVISION, 0);
+	}
+	
+	@Override
+	public void tearDown() throws Exception {
+		// XXX: Soon we'll be able to replace the two lines below with LocalStorage.resetDatabase().
+		getActivity().getContentResolver().delete(Tomdroid.CONTENT_URI, null, null);
+		Preferences.putLong(Preferences.Key.LATEST_SYNC_REVISION, 0);
+		super.tearDown();
+	}
+}

=== added file 'tests/org/tomdroid/NoteTest.java'
--- tests/org/tomdroid/NoteTest.java	1970-01-01 00:00:00 +0000
+++ tests/org/tomdroid/NoteTest.java	2010-10-03 12:21:44 +0000
@@ -0,0 +1,35 @@
+package org.tomdroid;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.tomdroid.Note;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+
+public class NoteTest extends TestCase {
+
+	public void testConstructorForNoteWithTags() throws JSONException {
+		JSONObject json = new JSONObject(
+				"{'title': 'foo', 'note-content': 'bar', " +
+				"'guid': '002e91a2-2e34-4e2d-bf88-21def49a7705', " +
+				"'last-change-date': '2009-04-19T21:29:23.2197340-07:00', " +
+				"'tags': ['tag1', 'tag2']}");
+		Note n = new Note(json);
+		Assert.assertEquals("foo", n.getTitle());	
+		Assert.assertEquals("002e91a2-2e34-4e2d-bf88-21def49a7705", n.getGuid().toString());
+		Assert.assertEquals("bar", n.getXmlContent());	
+		Assert.assertEquals("tag1,tag2,", n.getTags());
+	}
+
+	public void testConstructorForNoteWithNoTags() throws JSONException {
+		JSONObject json = new JSONObject(
+				"{'title': 'foo', 'note-content': 'bar', " +
+				"'guid': '002e91a2-2e34-4e2d-bf88-21def49a7705', " +
+				"'last-change-date': '2009-04-19T21:29:23.2197340-07:00'}");
+		Note n = new Note(json);
+		Assert.assertEquals("foo", n.getTitle());
+		Assert.assertEquals("", n.getTags());
+	}
+}