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

[Rodja]

This branch introduces basic two-way syncing with the Web Sync Method. It's now possible to edit a note and push changes to the server. Collisions are handled by leaving both versions in the Note. Other features like creating and deleting Notes or having a fancy Edit View should be seperated tasks.

[Olivier Bilodeau (plaxx)]

I would like to review this for inclusion in the next release which I would like to do soon.

I tried to merge with master but there are 14 conflicts... Most of them seems to be because of the "automated" tools reformatting xml and re-organizing imports and whitespace.. and I'm not saying it's your fault or whatever I'm just tired of tools messing with code because it's messing with source control...

Anyway, would you have the patience and the kindness to merge with lp:tomdroid so I can focus on the review bit? If your are busy or anything it's fine, I'll post-pone merging to the next cycle.

[Stefan Hammer (j-4-deactivatedaccount)]

I think, if we get this awesome editing feature into the next release, we should do some minor changes to significantly enhance usability.

In list view it would be easy to implement and really awesome to have
 * Longpress -> Delete
 * Longpress -> Edit

In "Note view" and "Edit view" I would remove the Menu -> Settings Button, because the settings do not affect viewing Notes or editing them, therefore the button is just confusing. Atm, the settings screen is just for synchronisation. So I would just display it in the List view.

Also displaying the Sync Button, while displaying/editing a note is not user-friendly, because the note won't update itself while in "Note view" or "Edit view". You have to go back to the list and "reload" the note. Alternatively one could refresh the note after synchronising.

In note view we could add a menu button "List View" to get back to the List immediately. Now if you press several internal links, the back button is not really convenient.

I would also recommend to cut away the <note-content version="0.1"> tag at the beginning and the end. this is easily done and makes the note much more readable while editing.
Additionally it would be awesome to have a separate text field for the title, as it is on Ubuntu One online. I think this is also easily done, by just cutting the string at the first line break.

I hope my suggested optimisations are not too much effort, but for me it sounds, as one who knows the code just has to add/delete a view lines.

Jango

[Stefan Hammer (j-4-deactivatedaccount)]

While using this branch, I discovered a very confusing issue: How is a note saved? Pressing the back button in Edit view does not save it, while using Menu - view does. Wouldn't it be better to call it just "save"?
What if one wants to discard his/her changes? Is it obvious enough to press back? I think we should include a "Discard" button.
What's about making a new note? is this feature already included?

=== All my suggestions summarised: ===

Menu items that make sense in my eyes:
 * List view: New Note, About, Reset DB, Settings
 * Note view: View List, Edit, Delete
 * Edit view: Save, Discard, Delete

Hide Sync Button in Note view and Edit view.

And Longpress events in List view:
 * Longpress -> Delete
 * Longpress -> Edit
 * Longpress -> Send (already included)

One could use this icons: (@android:drawable/)
 * New Note: ic_menu_compose
 * About: ic_menu_info_details
 * Reset DB: ic_menu_revert
 * Settings: ic_menu_preferences
 * View List: ic_menu_home or ic_menu_sort_by_size
 * Edit: ic_menu_edit
 * Delete: ic_menu_delete
 * Save: ic_menu_save
 * Discard: ic_menu_close_clear_cancel

Unmerged revisions

280. By Rodja on 2010-10-10

merged with master (Tomdroid version 0.4)

279. By Rodja on 2010-10-10

added missing copyright informations

278. By Rodja on 2010-10-04

removed warnings and added gpl header

277. By Rodja on 2010-10-04

Non-synced Notes are displayed as 'locally modified'

276. By Rodja on 2010-10-03

merged with current sync-ui to get all the great improvements

275. By Rodja on 2010-09-26

Using doubletap to switch between view and edit mode because longpress is needed for copy/paste.

274. By Rodja on 2010-09-05

Removed obsolete member flag.

273. By Rodja on 2010-09-04

Added menu action to reset all local changes and get a clean sync from server.

272. By Rodja on 2010-09-04

Rebuilding content each time viewNote is called to show the editings.

271. By Rodja on 2010-09-04

Changing options menu according to edit mode.

=== modified file '.classpath'
--- .classpath	2010-08-31 21:44:24 +0000
+++ .classpath	2010-10-10 07:54:44 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="tests"/>
 	<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-10-09 20:20:32 +0000
+++ AndroidManifest.xml	2010-10-10 07:54:44 +0000
@@ -48,10 +48,9 @@
 
     	</activity>
 
-      <uses-library android:name="android.test.runner" />
+        <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>
-
+	<uses-permission android:name="android.permission.INTERNET" />
+    <instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="org.tomdroid"></instrumentation>
 </manifest> 

=== modified file 'res/layout/main.xml'
--- res/layout/main.xml	2010-09-26 19:57:31 +0000
+++ res/layout/main.xml	2010-10-10 07:54:44 +0000
@@ -5,6 +5,7 @@
  http://www.launchpad.net/tomdroid
 
  Copyright 2008, 2009 Olivier Bilodeau <[e-mail]>
+ Copyright 2010 Rodja Trappe <[e-mail]>
  
  This file is part of Tomdroid.
  

=== modified file 'res/layout/note_view.xml'
--- res/layout/note_view.xml	2010-09-26 19:57:31 +0000
+++ res/layout/note_view.xml	2010-10-10 07:54:44 +0000
@@ -5,6 +5,7 @@
  http://www.launchpad.net/tomdroid
 
  Copyright 2008, 2009 Olivier Bilodeau <[e-mail]>
+ Copyright 2010 Rodja Trappe <[e-mail]>
  
  This file is part of Tomdroid.
  
@@ -21,40 +22,49 @@
  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"
-			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>
+		>
+
+    <include android:id="@+id/actionbar" layout="@layout/actionbar" />
+	
+	<FrameLayout
+    android:id="@+id/container"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+
+     	<TextView 
+			  android:background="@android:color/transparent"
+              android:id="@+id/viewContent"
+			  android:layout_width="fill_parent" 
+			  android:layout_height="fill_parent"
+			  android:gravity="top"
+              android:scrollbars="vertical"
+              android:fadingEdge="vertical"
+              android:linksClickable="true"
+              android:inputType="none"
+			  android:padding="10dip"
+			  android:textSize="20dip"
+			  />
+    
+    	<EditText 
+			  android:background="@android:color/transparent"
+              android:id="@+id/editContent"
+			  android:layout_width="fill_parent" 
+			  android:layout_height="fill_parent"
+			  android:gravity="top"
+              android:scrollbars="vertical"
+              android:fadingEdge="vertical"
+              android:linksClickable="false"
+              android:inputType="textLongMessage|textMultiLine|textAutoComplete"
+			  android:padding="10dip"
+			  android:textSize="20dip"
+			  android:visibility="gone"
+			  />
+
+    </FrameLayout>
 </LinearLayout>
\ No newline at end of file

=== modified file 'res/menu/main.xml'
--- res/menu/main.xml	2010-06-12 05:53:50 +0000
+++ res/menu/main.xml	2010-10-10 07:54:44 +0000
@@ -29,6 +29,11 @@
 			android:id="@+id/menuAbout"
 			/>
 	
+		<item 
+			android:icon="@android:drawable/ic_menu_revert"
+			android:title="@string/menuRevert"
+			android:id="@+id/menuRevert"
+			/>
 	
 	<item 
 			android:icon="@android:drawable/ic_menu_preferences"

=== added file 'res/menu/view_note.xml'
--- res/menu/view_note.xml	1970-01-01 00:00:00 +0000
+++ res/menu/view_note.xml	2010-10-10 07:54:44 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+ 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/>.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item 
+			android:icon="@android:drawable/ic_menu_edit"
+			android:title="@string/menuEdit"
+			android:id="@+id/menuEdit"
+			/>
+	
+	<item 
+			android:icon="@android:drawable/ic_menu_view"
+			android:title="@string/menuView"
+			android:id="@+id/menuView"
+			/>
+	
+	<item 
+			android:icon="@android:drawable/ic_menu_delete"
+			android:title="@string/menuDelete"
+			android:id="@+id/menuDelete"
+			/>
+
+	<item 
+			android:icon="@android:drawable/ic_menu_preferences"
+			android:title="@string/menuPrefs"
+			android:id="@+id/menuPrefs"/>
+</menu>

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2010-10-09 19:58:11 +0000
+++ res/values/strings.xml	2010-10-10 07:54:44 +0000
@@ -27,7 +27,6 @@
     <string name="author">Olivier Bilodeau</string>
 
 	<!-- main.xml -->
-    <string name="strListEmptyWaiting">Please wait while the notes load..</string>
     <string name="strListEmptyNoNotes">
     	There are no notes in Tomdroid\'s database.
     </string>
@@ -35,6 +34,10 @@
     <string name="menuSync">Sync</string>
 	<string name="menuPrefs">Settings</string>
     <string name="menuAbout">About</string>
+    <string name="menuDelete">Delete</string>
+    <string name="menuEdit">Edit</string>
+    <string name="menuView">View</string>
+    <string name="menuRevert">Reset DB</string>
     <string name="strWelcome">
     	Welcome to Tomdroid.
     	\n\nPlease note that this is beta quality software and that it contains known problems,
@@ -58,16 +61,13 @@
     <string name="btnCancel">Cancel</string>
 
 	<!-- 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="prefSyncMethod">Sync Method</string>
+	<string name="prefSyncServerUri">Sync Server Address</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 file 'res/values/styles.xml'
--- res/values/styles.xml	1970-01-01 00:00:00 +0000
+++ res/values/styles.xml	2010-10-10 07:54:44 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>  
+<resources>
+
+<style name="NoteListTitle" parent="@android:style/TextAppearance">  
+	<item name="android:textSize">22sp</item>  
+    <item name="android:textColor">#000000</item>  
+    <item name="android:padding">10dip</item>
+</style>  
+
+<style name="NoteListTileUnsynced" parent="@style/NoteListTitle">
+    <item name="android:textStyle">bold</item>  
+</style>
+
+</resources>
\ No newline at end of file

=== modified file 'res/xml/preferences.xml'
--- res/xml/preferences.xml	2010-09-26 11:34:42 +0000
+++ res/xml/preferences.xml	2010-10-10 07:54:44 +0000
@@ -3,13 +3,12 @@
 	                        
 	<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"/>
+		<ListPreference android:title="@string/prefSyncMethod"
+						android:dialogTitle="Choose the sync method to use"
+						android:key="sync_method"/>
 						
-		<EditTextPreference android:key="sync_server"
-							android:title="@string/prefSyncServer"
+		<EditTextPreference android:key="sync_server_uri"
+							android:title="@string/prefSyncServerUri"
 							android:positiveButtonText="@string/prefAuthenticate"
 							android:shouldDisableView="true"/>
 							

=== modified file 'src/org/tomdroid/Note.java'
--- src/org/tomdroid/Note.java	2010-10-03 12:16:28 +0000
+++ src/org/tomdroid/Note.java	2010-10-10 07:54:44 +0000
@@ -1,25 +1,26 @@
 /*
- * Tomdroid
- * Tomboy on Android
- * http://www.launchpad.net/tomdroid
+ * Tomdroid 
+ * Tomboy on Android 
+ * http://www.launchpad.net/tomdroid 
  * 
- * Copyright 2008, 2009 Olivier Bilodeau <[e-mail]>
+ * Copyright 2008, 2009 Olivier Bilodeau <[e-mail]> 
  * 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.
+ * 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.
+ * 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/>.
+ * 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;
 
@@ -27,32 +28,35 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONArray;
 import org.tomdroid.util.NoteContentBuilder;
 import org.tomdroid.util.XmlUtils;
 
+import android.database.Cursor;
 import android.os.Handler;
 import android.text.SpannableStringBuilder;
 import android.text.format.Time;
 import android.util.Log;
 import android.util.TimeFormatException;
 
-public class Note {
+public class Note implements Cloneable {
 
 	// Static references to fields (used in Bundles, ContentResolvers, etc.)
 	public static final String ID = "_id";
 	public static final String GUID = "guid";
 	public static final String TITLE = "title";
 	public static final String MODIFIED_DATE = "modified_date";
+	public static final String IS_SYNCED = "is_synced";
 	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
-	private static final String TAG = "Note";
-	
+	private static final String		TAG						= "Note";
+
 	// Notes constants
 	// 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;
@@ -71,6 +75,8 @@
 	private Time lastChangeDate;
 	private int dbId;
 	private UUID guid;
+	private long lastSyncRevision;
+	private boolean isSynced = true;
 	
 	// Date converter pattern (remove extra sub milliseconds from datetime string)
 	// ex: will strip 3020 in 2010-01-23T12:07:38.7743020-05:00
@@ -80,15 +86,20 @@
 			"([-\\+]\\d{2}:\\d{2})");									// matches timezone (-xx:xx or +xx:xx)
 	
 	public Note() {
-		tags = new String();
+		setTitle("no tilte");
+		setGuid(UUID.randomUUID());
+		lastSyncRevision = 0;
+		changeXmlContent("no content");
+		setTags("");
 	}
-	
+
 	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"));
+		lastSyncRevision = json.optInt("last-sync-revision", -1);
 		setXmlContent(json.optString("note-content"));
 		JSONArray jtags = json.optJSONArray("tags");
 		String tag;
@@ -100,11 +111,36 @@
 			}
 		}
 	}
+
+	public Note(Cursor cursor) {
+		String content = cursor.getString(cursor.getColumnIndexOrThrow(Note.NOTE_CONTENT));
+		setXmlContent(content);
+
+		String title = cursor.getString(cursor.getColumnIndexOrThrow(Note.TITLE));
+		setTitle(title);
+
+		String lastChangeDate = cursor.getString(cursor.getColumnIndexOrThrow(Note.MODIFIED_DATE));
+		setLastChangeDate(lastChangeDate);
+
+		setGuid(cursor.getString(cursor.getColumnIndexOrThrow(Note.GUID)));
+
+		setTags(cursor.getString(cursor.getColumnIndexOrThrow(Note.TAGS)));
+
+		int synced = cursor.getInt(cursor.getColumnIndexOrThrow(Note.IS_SYNCED));
+		isSynced(synced == 1 ? true : false);
+	}
+
+	/**
+	 * Weather the note is in sync with the server or not. Default is 'true'.
+	 */
+	public boolean isSynced() {
+		return isSynced;
+	}
+
+	public void isSynced(boolean flag) {
+		isSynced = flag;
+	}
 	
-	public String getTags() {
-		return tags;
-	}
-
 	public String getUrl() {
 		return url;
 	}
@@ -129,29 +165,47 @@
 		this.title = title;
 	}
 
+	public String getTags() {
+		return tags;
+	}
+
+	public void setTags(String tags) {
+		this.tags= tags;
+	}
+
 	public Time getLastChangeDate() {
 		return lastChangeDate;
 	}
 
+	public long getLastSyncRevision() {
+		return lastSyncRevision;
+	}
+
+	public void setLastSyncRevision(long revision) {
+		 lastSyncRevision = revision;
+	}
+
 	public void setLastChangeDate(Time lastChangeDate) {
 		this.lastChangeDate = lastChangeDate;
+		lastChangeDate.switchTimezone(Time.TIMEZONE_UTC);
 	}
-	
+
 	public void setLastChangeDate(String lastChangeDateStr) throws TimeFormatException {
-		
+
 		// regexp out the sub-milliseconds from tomboy's datetime format
 		// Normal RFC 3339 format: 2008-10-13T16:00:00.000-07:00
 		// Tomboy's (C# library) format: 2010-01-23T12:07:38.7743020-05:00
 		Matcher m = dateCleaner.matcher(lastChangeDateStr);
 		if (m.find()) {
 			Log.d(TAG, "I had to clean out extra sub-milliseconds from the date");
-			lastChangeDateStr = m.group(1)+m.group(2);
-			Log.v(TAG, "new date: "+lastChangeDateStr);
+			lastChangeDateStr = m.group(1) + m.group(2);
+			Log.v(TAG, "new date: " + lastChangeDateStr);
 		}
-		
+
 		lastChangeDate = new Time();
 		lastChangeDate.parse3339(lastChangeDateStr);
-	}	
+		lastChangeDate.switchTimezone(Time.TIMEZONE_UTC);
+	}
 
 	public int getDbId() {
 		return dbId;
@@ -160,35 +214,109 @@
 	public void setDbId(int id) {
 		this.dbId = id;
 	}
-	
+
 	public UUID getGuid() {
 		return guid;
 	}
-	
+
 	public void setGuid(String guid) {
 		this.guid = UUID.fromString(guid);
 	}
 
+	public void setGuid(UUID guid) {
+		this.guid = guid;
+	}
+
 	// TODO: should this handler passed around evolve into an observer pattern?
 	public SpannableStringBuilder getNoteContent(Handler handler) {
-		
+
 		// TODO not sure this is the right place to do this
-		noteContent = new NoteContentBuilder().setCaller(handler).setInputSource(xmlContent).build();
+		noteContent = new NoteContentBuilder().setCaller(handler).setInputSource(getXmlContent())
+				.build();
 		return noteContent;
 	}
-	
+
 	public String getXmlContent() {
 		return xmlContent;
 	}
-	
+
+	/**
+	 * Change the content while leaving last-change-date untouched.
+	 */
 	public void setXmlContent(String xmlContent) {
 		this.xmlContent = xmlContent;
 	}
 
+	/**
+	 * Updates the content and sets last-change-date to now and flags the note as "not in sync with server".
+	 */
+	public void changeXmlContent(String xmlContent) {
+		this.xmlContent = xmlContent;
+		Time time = new Time();
+		time.setToNow();
+		setLastChangeDate(time);
+		isSynced(false);
+	}
+
+	public JSONObject toJsonWithoutContent() throws JSONException {
+		JSONObject json = toJson();
+		json.remove("note-content");
+		return json;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (!(obj instanceof Note))
+			return false;
+
+		Note note = (Note) obj;
+		if (note.getGuid().equals(getGuid())
+				&& note.getLastChangeDate().equals(getLastChangeDate())
+				&& note.getTitle().equals(getTitle()))
+			return true;
+
+		return false;
+	}
+
+	public JSONObject toJson() throws JSONException {
+		return new JSONObject("{'guid':'" + getGuid() + "', 'title':'" + getTitle()
+				+ "', 'note-content':'" + getJsonPreparedXmlContent() + "', 'last-change-date':'"
+				+ getLastChangeDate().format3339(false) + "', 'note-content-version':0.1}");
+	}
+
+	private String getJsonPreparedXmlContent() {
+		return getXmlContent().replace("\n", "\\n")
+				              .replace("\"", "\\\"")
+				              .replace("'", "\\'")
+				              .replace("\b", "\\b")
+				              .replace("\f", "\\f")
+				              .replace("\n", "\\n")
+				              .replace("\r", "\\r")
+				              .replace("\t", "\\t");
+	}
+
 	@Override
 	public String toString() {
 
-		return new String("Note: "+ getTitle() + " (" + getLastChangeDate() + ")");
-	}
-	
+		return new String("Note: " + getTitle() + " (" + getLastChangeDate() + ")");
+	}
+
+	public Note clone() {
+
+		Note clone = new Note();
+
+		clone.noteContent = noteContent;
+		clone.xmlContent = xmlContent;
+		clone.url = url;
+		clone.fileName = fileName;
+		clone.title = title;
+		clone.lastChangeDate = lastChangeDate;
+		clone.lastSyncRevision = lastSyncRevision;
+		clone.dbId = dbId;
+		clone.guid = guid;
+		clone.tags = tags;
+
+		return clone;
+
+	}
 }

=== modified file 'src/org/tomdroid/NoteManager.java'
--- src/org/tomdroid/NoteManager.java	2010-10-09 19:48:21 +0000
+++ src/org/tomdroid/NoteManager.java	2010-10-10 07:54:44 +0000
@@ -5,6 +5,7 @@
  * 
  * Copyright 2009, 2010 Benoit Garret <[e-mail]>
  * Copyright 2009, 2010 Olivier Bilodeau <[e-mail]>
+ * Copyright 2010       Rodja Trappe <[e-mail]> 
  * 
  * This file is part of Tomdroid.
  * 
@@ -14,120 +15,135 @@
  * (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.
+ * 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/>.
+ * You should have received a copy of the GNU General Public License 
+ * along with Tomdroid. If not, see <http://www.gnu.org/licenses/>.
  */
 package org.tomdroid;
 
+import java.util.UUID;
+
 import org.tomdroid.ui.Tomdroid;
 import org.tomdroid.util.NoteListCursorAdapter;
 
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentValues;
+import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.util.Log;
 import android.widget.ListAdapter;
 
 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, 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 = {};
-	
+	public static final String[]	FULL_PROJECTION		= { Note.ID, Note.TITLE, Note.FILE,
+			Note.NOTE_CONTENT, Note.MODIFIED_DATE, Note.GUID, Note.IS_SYNCED, Note.TAGS };
+	public static final String[]	LIST_PROJECTION		= { Note.ID, Note.TITLE, Note.MODIFIED_DATE, Note.IS_SYNCED };
+	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	= {};
+
 	// static properties
-	private static final String TAG = "NoteManager";
-	
-	// gets a note from the content provider
-	public static Note getNote(Activity activity, Uri uri) {
-		
+	private static final String		TAG					= "NoteManager";
+
+	public static Note getNote(Context context, Uri uri) {
+		Cursor cursor = context.getContentResolver().query(uri, FULL_PROJECTION, null, null, null);
+		return getNote(cursor);
+	}
+
+	public static Note getNote(Context context, UUID guid) {
+		String[] whereArgs = { guid.toString() };
+		Cursor cursor = context.getContentResolver().query(Tomdroid.CONTENT_URI, FULL_PROJECTION,
+				Note.GUID + "=?", whereArgs, null);
+
+		return getNote(cursor);
+	}
+
+	/**
+	 * Creates a Note which is described at the cursor position.
+	 */
+	public static Note getNote(Cursor cursor) {
 		Note note = null;
-		
-		// can we find a matching note?
-		Cursor cursor = activity.managedQuery(uri, FULL_PROJECTION, null, null, null);
-		// cursor must not be null and must return more than 0 entry 
 		if (!(cursor == null || cursor.getCount() == 0)) {
-			
+
 			// create the note from the cursor
 			cursor.moveToFirst();
-			String noteContent = cursor.getString(cursor.getColumnIndexOrThrow(Note.NOTE_CONTENT));
-			String noteTitle = cursor.getString(cursor.getColumnIndexOrThrow(Note.TITLE));
-			
-			note = new Note();
-			note.setXmlContent(noteContent);
-			note.setTitle(noteTitle);
+			note = new Note(cursor);
 		}
-		
+		cursor.close();
 		return note;
 	}
-	
-	// puts a note in the content provider
+
 	public static void putNote(Activity activity, Note note) {
-		
+
 		// verify if the note is already in the content provider
-		
+
 		// TODO make the query prettier (use querybuilder)
 		Uri notes = Tomdroid.CONTENT_URI;
 		String[] whereArgs = new String[1];
 		whereArgs[0] = note.getGuid().toString();
-		
+
 		// The note identifier is the guid
 		ContentResolver cr = activity.getContentResolver();
-		Cursor managedCursor = cr.query(notes,
-                EMPTY_PROJECTION,  
-                Note.GUID + "= ?",
-                whereArgs,
-                null);
+		Cursor managedCursor = cr
+				.query(notes, EMPTY_PROJECTION, Note.GUID + "= ?", whereArgs, null);
 		activity.startManagingCursor(managedCursor);
-		
+
 		// Preparing the values to be either inserted or updated
 		// depending on the result of the previous query
 		ContentValues values = new ContentValues();
 		values.put(Note.TITLE, note.getTitle());
 		values.put(Note.FILE, note.getFileName());
 		values.put(Note.GUID, note.getGuid().toString());
-		// Notice that we store the date in UTC because sqlite doesn't handle RFC3339 timezone information
+		values.put(Note.IS_SYNCED, note.isSynced() ? 1 : 0);
+		// 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) {
-			
+
 			// This note is not in the database yet we need to insert it
-			if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"A new note has been detected (not yet in db)");
-			
-    		Uri uri = cr.insert(Tomdroid.CONTENT_URI, values);
-
-    		if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Note inserted in content provider. ID: "+uri+" TITLE:"+note.getTitle()+" GUID:"+note.getGuid());
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.v(TAG, "A new note has been detected (not yet in db)");
+
+			Uri uri = cr.insert(Tomdroid.CONTENT_URI, values);
+
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.v(TAG, "Note inserted in content provider. ID: '" + uri + "', TITLE: '"
+						+ note.getTitle() + "', GUID: '" + note.getGuid() + "',URI: " + uri);
 		} else {
-			
+
 			// Overwrite the previous note if it exists
-			cr.update(Tomdroid.CONTENT_URI, values, Note.GUID+" = ?", whereArgs);
-			
-			if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Note updated in content provider. TITLE:"+note.getTitle()+" GUID:"+note.getGuid());
+			cr.update(Tomdroid.CONTENT_URI, values, Note.GUID + " = ?", whereArgs);
+
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.v(TAG, "Note updated in content provider. TITLE:" + note.getTitle() + " GUID:"
+						+ note.getGuid());
 		}
 	}
-	
-	public static boolean deleteNote(Activity activity, int id)
-	{
-		Uri uri = Uri.parse(Tomdroid.CONTENT_URI+"/"+id);
-		
+
+	public static boolean deleteNote(Activity activity, int databaseId) {
+		Uri uri = Uri.parse(Tomdroid.CONTENT_URI + "/" + databaseId);
+
 		ContentResolver cr = activity.getContentResolver();
 		int result = cr.delete(uri, null, null);
-		
-		if(result > 0)
+
+		if (result > 0)
 			return true;
 		else
 			return false;
 	}
+
+	public static void deleteNote(Context context, UUID guid) {
+		String[] whereArgs = { guid.toString() };
+		context.getContentResolver().delete(Tomdroid.CONTENT_URI, Note.GUID + "=?", whereArgs);
+	}
 	
 	public static Cursor getAllNotes(Activity activity, Boolean includeNotebookTemplates) {
 		// get a cursor representing all notes from the NoteProvider
@@ -140,51 +156,51 @@
 		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
 		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, Note.MODIFIED_DATE };
+		String[] from = new String[] { Note.TITLE, Note.IS_SYNCED, 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) {
-		
+
 		// get a cursor containing the notes titles
 		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()
+
+	// gets the ids of the notes present in the db
 	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;
-		
+
 		// get the notes ids
 		String[] whereArgs = { title };
-		Cursor cursor = activity.managedQuery(Tomdroid.CONTENT_URI, ID_PROJECTION, Note.TITLE+"=?", whereArgs, null);
-		
-		// cursor must not be null and must return more than 0 entry 
+		Cursor cursor = activity.managedQuery(Tomdroid.CONTENT_URI, ID_PROJECTION, Note.TITLE
+				+ "=?", whereArgs, null);
+
+		// cursor must not be null and must return more than 0 entry
 		if (!(cursor == null || cursor.getCount() == 0)) {
-			
+
 			cursor.moveToFirst();
 			id = cursor.getInt(cursor.getColumnIndexOrThrow(Note.ID));
-		}
-		else {
+		} else {
 			// TODO send an error to the user
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "Cursor returned null or 0 notes");
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.d(TAG, "Cursor returned null or 0 notes");
 		}
-		
+
 		return id;
 	}
 }

=== modified file 'src/org/tomdroid/NoteProvider.java'
--- src/org/tomdroid/NoteProvider.java	2010-09-17 20:37:42 +0000
+++ src/org/tomdroid/NoteProvider.java	2010-10-10 07:54:44 +0000
@@ -5,6 +5,8 @@
  * 
  * Copyright 2009 Olivier Bilodeau <[e-mail]>
  * Copyright 2009 Benoit Garret <[e-mail]>
+ * Copyright 2010 Rodja Trappe <[e-mail]> 
+ * 
  * 
  * This file is part of Tomdroid.
  * 
@@ -69,7 +71,7 @@
 	// --	
 	private static final String DATABASE_NAME = "tomdroid-notes.db";
 	private static final String DB_TABLE_NOTES = "notes";
-	private static final int DB_VERSION = 3;
+	private static final int DB_VERSION = 6;
 	private static final String DEFAULT_SORT_ORDER = Note.MODIFIED_DATE + " DESC";
 	
     private static HashMap<String, String> notesProjectionMap;
@@ -101,6 +103,7 @@
                     + Note.FILE + " TEXT,"
                     + Note.NOTE_CONTENT + " TEXT,"
                     + Note.MODIFIED_DATE + " STRING,"
+                    + Note.IS_SYNCED + " INTEGER,"
                     + Note.TAGS + " STRING"
                     + ");");
         }
@@ -160,7 +163,6 @@
             orderBy = sortOrder;
         }
         
-
         // Get the database and run the query
         SQLiteDatabase db = dbHelper.getReadableDatabase();
         Cursor c = qb.query(db, projection, selection, selectionArgs, null, null, orderBy);
@@ -300,5 +302,6 @@
         notesProjectionMap.put(Note.NOTE_CONTENT, Note.NOTE_CONTENT);
         notesProjectionMap.put(Note.TAGS, Note.TAGS);
         notesProjectionMap.put(Note.MODIFIED_DATE, Note.MODIFIED_DATE);
+        notesProjectionMap.put(Note.IS_SYNCED, Note.IS_SYNCED);
     }
 }

=== added file 'src/org/tomdroid/sync/LocalStorage.java'
--- src/org/tomdroid/sync/LocalStorage.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/sync/LocalStorage.java	2010-10-10 07:54:44 +0000
@@ -0,0 +1,156 @@
+/*
+ * 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.sync;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+import org.tomdroid.Note;
+import org.tomdroid.NoteManager;
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.Preferences;
+
+import android.app.Activity;
+import android.database.Cursor;
+import android.util.Log;
+
+/**
+ * Wrapper around NoteManager to hide "Android content cursors" and enables note storage
+ * manipulation via Tomboy id's, titles and the like.
+ */
+public class LocalStorage {
+
+	private static final String	TAG	= "LocalStorage";
+
+	// TODO This data base accessor should not need a reference to an Activity. Currently the
+	// NoteManager unfortunately uses managed queries (which is dispensable).
+	private Activity			activity;
+
+	public LocalStorage(Activity activity) {
+		this.activity = activity;
+	}
+
+	/**
+	 * Insert a note in the content provider. The identifier for the notes is the guid.
+	 */
+	public void insertNote(Note note) {
+		NoteManager.putNote(this.activity, note);
+	}
+
+	/**
+	 * merges content into the existing note. The identifier for the note is the guid.
+	 */
+	public void mergeNote(Note note) {
+		// TODO implement a better merge algorithm then "append"
+		Note storedNote = getNote(note.getGuid());
+		if (storedNote != null && !storedNote.isSynced()){
+			note.changeXmlContent(note.getXmlContent() + " --merged-- " + storedNote.getXmlContent());
+		}
+		NoteManager.putNote(this.activity, note);
+	}
+
+	public Set<String> getNoteGuids() {
+		Set<String> idList = new HashSet<String>();
+
+		Cursor idCursor = NoteManager.getGuids(this.activity);
+
+		// cursor must not be null and must return more than 0 entry
+		if (!(idCursor == null || idCursor.getCount() == 0)) {
+
+			String guid;
+			idCursor.moveToFirst();
+
+			do {
+				guid = idCursor.getString(idCursor.getColumnIndexOrThrow(Note.GUID));
+				idList.add(guid);
+
+			} while (idCursor.moveToNext());
+
+		} else {
+
+			// TODO send an error to the user
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.d(TAG, "Cursor returned null or 0 notes");
+		}
+
+		return idList;
+	}
+
+	public void deleteNotes(Set<String> guids) {
+
+		for (String guid : guids) {
+			NoteManager.deleteNote(activity, UUID.fromString(guid));
+		}
+	}
+
+	/**
+	 * Empties the complete database. Used to get a fresh start.
+	 */
+	public void resetDatabase() {
+		activity.getContentResolver().delete(Tomdroid.CONTENT_URI, null, null);
+		Preferences.putLong(Preferences.Key.LATEST_SYNC_REVISION, 0);
+	}
+
+	public long getLatestSyncVersion() {
+		return (Long) Preferences.getLong(Preferences.Key.LATEST_SYNC_REVISION);
+	}
+
+	public Note getNote(UUID guid) {
+		return NoteManager.getNote(activity, guid);
+	}
+
+	public ArrayList<Note> getNewAndUpdatedNotes() {
+		ArrayList<Note> notes = new ArrayList<Note>();
+
+		String[] whereArgs = { "0" };
+		Cursor cursor = activity.getContentResolver().query(Tomdroid.CONTENT_URI,
+				NoteManager.FULL_PROJECTION, Note.IS_SYNCED + "=?", whereArgs, null);
+
+		if (cursor == null)	return notes;
+		if (cursor.getCount() == 0) {
+			cursor.close();
+			return notes;
+		}
+		
+		cursor.moveToFirst();
+
+		do {
+			notes.add(new Note(cursor));
+		} while (cursor.moveToNext());
+		
+		cursor.close();
+		
+		return notes;
+	}
+
+	public void onSynced(Long syncRevisionOfServer) {
+		Preferences.putLong(Preferences.Key.LATEST_SYNC_REVISION, syncRevisionOfServer);
+		ArrayList<Note> syncedNotes = getNewAndUpdatedNotes();
+		for (Note note : syncedNotes) {
+			note.isSynced(true);
+			NoteManager.putNote(activity, note);
+		}
+	}
+}

=== modified file 'src/org/tomdroid/sync/SyncManager.java'
--- src/org/tomdroid/sync/SyncManager.java	2010-09-26 19:57:31 +0000
+++ src/org/tomdroid/sync/SyncManager.java	2010-10-10 07:54:44 +0000
@@ -4,6 +4,7 @@
  * http://www.launchpad.net/tomdroid
  * 
  * Copyright 2009, Benoit Garret <[e-mail]>
+ * Copyright 2010, Rodja Trappe <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -26,33 +27,33 @@
 import java.util.ArrayList;
 
 import org.tomdroid.sync.sd.SdCardSyncService;
-import org.tomdroid.sync.web.SnowySyncService;
+import org.tomdroid.sync.web.SnowySyncMethod;
 import org.tomdroid.util.Preferences;
 
 import android.app.Activity;
 import android.os.Handler;
-import android.util.Log;
 
 public class SyncManager {
 	
+	@SuppressWarnings("unused")
 	private static final String TAG = "SyncManager";
 	
-	private ArrayList<SyncService> services = new ArrayList<SyncService>();
+	private ArrayList<SyncMethod> syncMethods = new ArrayList<SyncMethod>();
 	
 	public SyncManager() {
-		createServices();
+		createSyncMethods();
 	}
 
-	public ArrayList<SyncService> getServices() {
-		return services;
+	public ArrayList<SyncMethod> getSyncMethods() {
+		return syncMethods;
 	}
 	
-	public SyncService getService(String name) {
+	public SyncMethod getSyncMethod(String name) {
 		
-		for (int i = 0; i < services.size(); i++) {
-			SyncService service = services.get(i);			
-			if (name.equals(service.getName()))
-				return service;
+		for (int i = 0; i < syncMethods.size(); i++) {
+			SyncMethod method = syncMethods.get(i);
+			if (name.equals(method.getName()))
+				return method;
 		}
 		
 		return null;
@@ -60,13 +61,14 @@
 	
 	public void startSynchronization() {
 		
-		SyncService service = getCurrentService();
-		service.startSynchronization();
+		SyncMethod method = getCurrentSyncMethod();
+		method.startSynchronization();
 	}
 	
-	public SyncService getCurrentService() {
-		String serviceName = Preferences.getString(Preferences.Key.SYNC_SERVICE);
-		return getService(serviceName);
+	public SyncMethod getCurrentSyncMethod() {
+		
+		String syncMethodName = Preferences.getString(Preferences.Key.SYNC_METHOD);
+		return getSyncMethod(syncMethodName);
 	}
 	
 	private static SyncManager instance = null;
@@ -83,21 +85,21 @@
 	
 	public static void setActivity(Activity a) {
 		activity = a;
-		getInstance().createServices();
+		getInstance().createSyncMethods();
 	}
 	
 	public static void setHandler(Handler h) {
 		handler = h;
-		getInstance().createServices();
+		getInstance().createSyncMethods();
 	}
 
-	private void createServices() {
-		services.clear();
+	private void createSyncMethods() {
+		syncMethods.clear();
 		
-		services.add(new SnowySyncService(activity, handler));
+		syncMethods.add(new SnowySyncMethod(activity, handler));
 		
 		try {
-			services.add(new SdCardSyncService(activity, handler));
+			syncMethods.add(new SdCardSyncService(activity, handler));
 		} catch (FileNotFoundException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

=== renamed file 'src/org/tomdroid/sync/SyncService.java' => 'src/org/tomdroid/sync/SyncMethod.java'
--- src/org/tomdroid/sync/SyncService.java	2010-08-30 16:33:02 +0000
+++ src/org/tomdroid/sync/SyncMethod.java	2010-10-10 07:54:44 +0000
@@ -24,153 +24,105 @@
  */
 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.content.Context;
 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;
-	
+public abstract class SyncMethod {
+
+	private static final String	TAG					= "SyncMethod";
+
+	private final static int	poolSize			= 1;
+
 	// 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) {
-		
+	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;
+
+	private Activity			activity;
+	private Handler				handler;
+
+	private ExecutorService		pool;
+
+	private int					syncProgress		= 100;
+
+	private LocalStorage		localStorage;
+
+	public SyncMethod(Activity activity, Handler handler) {
+
 		this.activity = activity;
 		this.handler = handler;
 		pool = Executors.newFixedThreadPool(poolSize);
-	}
+
+		localStorage = new LocalStorage(activity);
+	}
+
+	protected LocalStorage getLocalStorage(){
+		return localStorage;
+	}
+	
 
 	public void startSynchronization() {
-		
-		if (syncProgress != 100){
-			Toast.makeText(activity, "Sync already in prgress", Toast.LENGTH_SHORT).show();
+		if (syncProgress != 100) {
+			Toast.makeText((Context) 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.
+	 * @return An human readable name, used in the preferences to distinguish the different sync
+	 *         methods.
 	 */
-	
 	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.
+	 * 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
+	 * @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.
+	 * @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 
+	 * @param progress
 	 */
-	
 	protected void setSyncProgress(int progress) {
 		synchronized (TAG) {
 			Log.v(TAG, "sync progress: " + progress);
@@ -181,10 +133,18 @@
 
 			handler.sendMessage(progressMessage);
 			syncProgress = progress;
+			
+			if (progress == 100){
+				onSyncCompleted();
+			}
 		}
 	}
+
+	protected void onSyncCompleted() {
+		handler.sendEmptyMessage(PARSING_COMPLETE);
+	}
 	
-	protected int getSyncProgress(){
+	protected int getSyncProgress() {
 		synchronized (TAG) {
 			return syncProgress;
 		}

=== modified file 'src/org/tomdroid/sync/sd/SdCardSyncService.java'
--- src/org/tomdroid/sync/sd/SdCardSyncService.java	2010-08-30 16:33:02 +0000
+++ src/org/tomdroid/sync/sd/SdCardSyncService.java	2010-10-10 07:54:44 +0000
@@ -40,7 +40,7 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.tomdroid.Note;
-import org.tomdroid.sync.SyncService;
+import org.tomdroid.sync.SyncMethod;
 import org.tomdroid.ui.Tomdroid;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -51,26 +51,31 @@
 import android.util.Log;
 import android.util.TimeFormatException;
 
-public class SdCardSyncService extends SyncService {
-	
-	private File path;
-	private int numberOfFilesToSync = 0;
-	
+public class SdCardSyncService extends SyncMethod {
+
+	private File				path;
+	private int					numberOfFilesToSync	= 0;
+	private int					filesSynced			= 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 = "SdCardSyncService";
-	
+	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";
@@ -85,7 +90,7 @@
 	public boolean needsServer() {
 		return false;
 	}
-	
+
 	@Override
 	public boolean needsAuth() {
 		return false;
@@ -100,54 +105,49 @@
 		if (Tomdroid.LOGGING_ENABLED) Log.v(TAG, "Loading local notes");
 		
 		File[] fileList = path.listFiles(new NotesFilter());
-		numberOfFilesToSync  = fileList.length;
-		
+		numberOfFilesToSync = fileList.length;
+
 		// If there are no notes, warn the UI through an empty message
 		if (fileList == null || fileList.length == 0) {
-			if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "There are no notes in "+path);
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.i(TAG, "There are no notes in " + path);
 			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
-			
+
+		filesSynced = 0;
+		for (int i = 0; i < fileList.length; i++) {
 			// give a filename to a thread and ask to parse it
-			execInThread(new Worker(fileList[i], false));
-        }
-		
-		// last task, warn it so it'll warn UI when done
-		execInThread(new Worker(fileList[fileList.length-1], true));
+			execInThread(new Worker(fileList[i]));
+		}
 	}
-	
+
 	/**
-	 * Simple filename filter that grabs files ending with .note
-	 * TODO move into its own static class in a util package
+	 * Simple filename filter that grabs files ending with .note TODO move into its own static class
+	 * in a util package
 	 */
 	private class NotesFilter implements FilenameFilter {
 		public boolean accept(File dir, String name) {
 			return (name.endsWith(".note"));
 		}
 	}
-	
+
 	/**
 	 * The worker spawns a new note, parse the file its being given by the executor.
 	 */
-	// TODO change type to callable to be able to throw exceptions? (if you throw make sure to display an alert only once)
+	// TODO change type to callable to be able to throw exceptions? (if you throw make sure to
+	// display an alert only once)
 	// http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/Callable.html
 	private class Worker implements Runnable {
-		
+
 		// the note to be loaded and parsed
-		private Note note = new Note();
-		private File file;
-		private boolean isLast;
-		final char[] buffer = new char[0x10000];
-		
-		public Worker(File f, boolean isLast) {
+		private Note	note	= new Note();
+		private File	file;
+		final char[]	buffer	= new char[0x10000];
+
+		public Worker(File f) {
 			file = f;
-			this.isLast = isLast;
 		}
 
 		public void run() {
@@ -178,7 +178,7 @@
 				if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "parsing note");
 				xr.parse(is);
 
-			// TODO wrap and throw a new exception here
+				// TODO wrap and throw a new exception here
 			} catch (ParserConfigurationException e) {
 				e.printStackTrace();
 			} catch (SAXException e) {
@@ -187,51 +187,59 @@
 				e.printStackTrace();
 			} catch (TimeFormatException e) {
 				e.printStackTrace();
-				if (Tomdroid.LOGGING_ENABLED) Log.e(TAG, "Problem parsing the note's date and time");
+				if (Tomdroid.LOGGING_ENABLED)
+					Log.e(TAG, "Problem parsing the note's date and time");
 				sendMessage(PARSING_FAILED);
 				onWorkDone();
 				return;
 			}
 
 			// extract the <note-content..>...</note-content>
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "retrieving what is inside of note-content");
-			
-			// FIXME here we are re-reading the whole note just to grab note-content out, there is probably a best way to do this (I'm talking to you xmlpull.org!)
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.d(TAG, "retrieving what is inside of note-content");
+
+			// FIXME here we are re-reading the whole note just to grab note-content out, there is
+			// probably a best way to do this (I'm talking to you xmlpull.org!)
 			StringBuilder out = new StringBuilder();
 			try {
 				int read;
 				Reader reader = new InputStreamReader(new FileInputStream(file), "UTF-8");
-				
+
 				do {
-				  read = reader.read(buffer, 0, buffer.length);
-				  if (read>0) {
-				    out.append(buffer, 0, read);
-				  }
-				}
-				while (read>=0);
-				
+					read = reader.read(buffer, 0, buffer.length);
+					if (read > 0) {
+						out.append(buffer, 0, read);
+					}
+				} while (read >= 0);
+
 				Matcher m = note_content.matcher(out.toString());
 				if (m.find()) {
 					note.setXmlContent(m.group());
 				} else {
-					if (Tomdroid.LOGGING_ENABLED) Log.w(TAG, "Something went wrong trying to grab the note-content out of a note");
+					if (Tomdroid.LOGGING_ENABLED)
+						Log
+								.w(TAG,
+										"Something went wrong trying to grab the note-content out of a note");
 				}
 
 			} catch (IOException e) {
 				// TODO handle properly
 				e.printStackTrace();
-				if (Tomdroid.LOGGING_ENABLED) Log.w(TAG, "Something went wrong trying to read the note");
+				if (Tomdroid.LOGGING_ENABLED)
+					Log.w(TAG, "Something went wrong trying to read the note");
 			}
-			
-			insertNote(note, isLast);
+
+			getLocalStorage().insertNote(note);
 			onWorkDone();
 		}
-		
-		private void onWorkDone(){
-			if (isLast) 
-				setSyncProgress(100);
-			else
-				setSyncProgress((int) (getSyncProgress() + 100.0 / numberOfFilesToSync));			
+
+		private void onWorkDone() {
+			
+			synchronized (SdCardSyncService.this) {
+				filesSynced++;
+			}
+			
+			setSyncProgress((int) (100 * (filesSynced / (double) numberOfFilesToSync)));
 		}
 	}
 }

=== modified file 'src/org/tomdroid/sync/web/OAuthConnection.java'
--- src/org/tomdroid/sync/web/OAuthConnection.java	2010-08-31 21:00:35 +0000
+++ src/org/tomdroid/sync/web/OAuthConnection.java	2010-10-10 07:54:44 +0000
@@ -4,6 +4,7 @@
  * http://www.launchpad.net/tomdroid
  * 
  * Copyright 2009, Benoit Garret <[e-mail]>
+ * Copyright 2010, Rodja Trappe <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -233,6 +234,7 @@
 	@Override
 	public String get(String uri) throws java.net.UnknownHostException {
 		
+		if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "GET " + uri);
 		// Prepare a request object
 		HttpGet httpGet = new HttpGet(uri);
 		sign(httpGet);

=== renamed file 'src/org/tomdroid/sync/web/SnowySyncService.java' => 'src/org/tomdroid/sync/web/SnowySyncMethod.java'
--- src/org/tomdroid/sync/web/SnowySyncService.java	2010-08-30 16:33:02 +0000
+++ src/org/tomdroid/sync/web/SnowySyncMethod.java	2010-10-10 07:54:44 +0000
@@ -4,6 +4,7 @@
  * http://www.launchpad.net/tomdroid
  * 
  * Copyright 2009, Benoit Garret <[e-mail]>
+ * Copyright 2010, Rodja Trappe <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -24,15 +25,13 @@
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Set;
 
-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.sync.SyncMethod;
 import org.tomdroid.ui.Tomdroid;
-import org.tomdroid.util.Preferences;
 
 import android.app.Activity;
 import android.net.Uri;
@@ -40,14 +39,14 @@
 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) {
+public class SnowySyncMethod extends SyncMethod implements ServiceAuth {
+
+	private static final String	TAG	= "SnowySyncMethod";
+
+	public SnowySyncMethod(Activity activity, Handler handler) {
 		super(activity, handler);
 	}
-	
+
 	@Override
 	public String getDescription() {
 		return "Tomboy Web";
@@ -57,9 +56,9 @@
 	public String getName() {
 		return "tomboy-web";
 	}
-	
+
 	public boolean isConfigured() {
-		OAuthConnection auth = getAuthConnection();
+		OAuthConnection auth = SyncServer.getAuthConnection();
 		return auth.isAuthenticated();
 	}
 
@@ -67,12 +66,12 @@
 	public boolean needsServer() {
 		return true;
 	}
-	
+
 	@Override
 	public boolean needsAuth() {
 		return true;
 	}
-	
+
 	public void getAuthUri(final String server, final Handler handler) {
 		
 		execInThread(new Runnable() {
@@ -110,7 +109,7 @@
 					// 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();
+					OAuthConnection auth = SyncServer.getAuthConnection();
 					boolean result = auth.getAccess(uri.getQueryParameter("oauth_verifier"));
 
 					if (Tomdroid.LOGGING_ENABLED) {
@@ -130,80 +129,38 @@
 			}
 		});
 	}
-	
+
 	@Override
-	public boolean isSyncable(){
-		 return super.isSyncable() && isConfigured();
+	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);
-		
+		if (Tomdroid.LOGGING_ENABLED)
+			Log.v(TAG, "Loading Snowy notes");
+
 		execInThread(new Runnable() {
-			
+
 			public void run() {
-				
-				OAuthConnection auth = getAuthConnection();
-				
 				try {
-					String rawResponse = auth.get(userRef);
+					SyncServer server = new SyncServer();
 					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);
-					
+
+					syncWith(server);
+
 				} catch (JSONException e1) {
-					if (Tomdroid.LOGGING_ENABLED) Log.e(TAG, "Problem parsing the server response", 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");
+					if (Tomdroid.LOGGING_ENABLED)
+						Log.e(TAG, "Internet connection not available");
 					sendMessage(NO_INTERNET);
 					setSyncProgress(100);
 					return;
@@ -211,22 +168,90 @@
 			}
 		});
 	}
-	
-	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;
-	}
+
+	void syncWith(SyncServer server) throws UnknownHostException, JSONException {
+
+		if (server.isInSync(getLocalStorage())) {
+			setSyncProgress(100);
+			return;
+		}
+
+		ensureServerIdIsAsExpected();
+
+		ArrayList<Note> updatesFromServer = server.getNoteUpdates();
+		setSyncProgress(50);
+
+		fixTitleConflicts(updatesFromServer);
+
+		insertAndUpdateLocalNotes(updatesFromServer);
+		setSyncProgress(70);
+
+		deleteNotesNotFoundOnServer(server);
+
+		if (!server.createNewRevisionWith(getLocalStorage().getNewAndUpdatedNotes())){
+			setSyncProgress(100);
+			return;
+	    }
+		setSyncProgress(90);
+
+		deleteNotesNotFoundOnClient(server);
+
+		getLocalStorage().onSynced(server.getSyncRevision());
+		setSyncProgress(100);
+	}
+	
+	private void deleteNotesNotFoundOnServer(SyncServer server) throws UnknownHostException,
+			JSONException {
+		Set<String> remotelyRemovedNoteIds = getLocalStorage().getNoteGuids();
+		remotelyRemovedNoteIds.removeAll(server.getNoteIds());
+		getLocalStorage().deleteNotes(remotelyRemovedNoteIds);
+	}
+
+	private void deleteNotesNotFoundOnClient(SyncServer server) throws UnknownHostException,
+			JSONException {
+		Set<String> locallyRemovedNoteIds = server.getNoteIds();
+		locallyRemovedNoteIds.removeAll(getLocalStorage().getNoteGuids());
+		server.delete(locallyRemovedNoteIds);
+	}
+
+	/**
+	 * Check if the server's guid is as expected to prevent deleting local notes, etc when the
+	 * server has been wiped or reinitialized by another client.
+	 */
+	private void ensureServerIdIsAsExpected() {
+
+		/*
+		 * // If the server has been wiped or reinitialized by another client // for some reason,
+		 * our local manifest is inaccurate and could misguide // sync into erroneously deleting
+		 * local notes, etc. We reset the client // to prevent this situation. string serverId =
+		 * server.Id; if (client.AssociatedServerId != serverId) { client.Reset ();
+		 * client.AssociatedServerId = serverId; }
+		 */
+	}
+
+	private void insertAndUpdateLocalNotes(ArrayList<Note> serverUpdates) {
+		for (Note noteUpdate : serverUpdates) {
+			getLocalStorage().mergeNote(noteUpdate);
+		}
+	}
+
+	private void fixTitleConflicts(ArrayList<Note> noteUpdates) {
+
+		// TODO implement in a similar way as Tomboy (see code below)
+
+		/*
+		 * // First, check for new local notes that might have title conflicts // with the updates
+		 * coming from the server. Prompt the user if necessary. // TODO: Lots of searching here and
+		 * in the next foreach... // Want this stuff to happen all at once first, but // maybe
+		 * there's a way to store this info and pass it on? foreach (NoteUpdate noteUpdate in
+		 * noteUpdates.Values) { if (FindNoteByUUID (noteUpdate.UUID) == null) { Note existingNote =
+		 * NoteMgr.Find (noteUpdate.Title); if (existingNote != null && !noteUpdate.BasicallyEqualTo
+		 * (existingNote)) { // Logger.Debug ("Sync: Early conflict detection for '{0}'",
+		 * noteUpdate.Title); if (syncUI != null) { syncUI.NoteConflictDetected (NoteMgr,
+		 * existingNote, noteUpdate, noteUpdateTitles); // Suspend this thread while the GUI is
+		 * presented to // the user. syncThread.Suspend (); } } } }
+		 */
+	}
+	
+	
 }

=== added file 'src/org/tomdroid/sync/web/SyncServer.java'
--- src/org/tomdroid/sync/web/SyncServer.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/sync/web/SyncServer.java	2010-10-10 07:54:44 +0000
@@ -0,0 +1,205 @@
+/*
+ * 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.sync.web;
+
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.tomdroid.Note;
+import org.tomdroid.sync.LocalStorage;
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.Preferences;
+
+import android.util.Log;
+
+public class SyncServer {
+
+	final String			TAG				= "SyncServer";
+	final String			userReference	= Preferences
+													.getString(Preferences.Key.SYNC_SERVER_USER_API);
+	private String			notesApiReference;
+	String					userName;
+	String					firstName;
+	String					lastName;
+	Long					syncVersionOnServer;
+	Long					currentSyncGuid;
+	private OAuthConnection	authConnection;
+
+	public SyncServer() throws UnknownHostException, JSONException {
+		authConnection = getAuthConnection();
+
+		readMetaData(getMetadata());
+	}
+
+	protected JSONObject getMetadata() throws UnknownHostException, JSONException {
+		String rawResponse = authConnection.get(userReference);
+		JSONObject response = new JSONObject(rawResponse);
+		return response;
+	}
+
+	protected void readMetaData(JSONObject response) throws JSONException {
+		Log.v(TAG, "userRef response: " + response.toString());
+		notesApiReference = response.getJSONObject("notes-ref").getString("api-ref");
+
+		userName = response.getString("user-name");
+		firstName = response.getString("first-name");
+		lastName = response.getString("last-name");
+
+		syncVersionOnServer = response.getLong("latest-sync-revision");
+		currentSyncGuid = response.getLong("current-sync-guid");
+	}
+
+	private String getNotesUri() {
+		return notesApiReference;
+	}
+
+	public boolean isInSync(LocalStorage localStorage) {
+		return localStorage.getLatestSyncVersion() == syncVersionOnServer
+				&& localStorage.getNewAndUpdatedNotes().isEmpty();
+	}
+	
+	public Long getSyncRevision() {
+		return syncVersionOnServer;
+	}
+
+	public JSONArray getNotes() throws UnknownHostException, JSONException {
+		JSONObject response = new JSONObject(authConnection.get(getNotesUri()
+				+ "?include_notes=true"));
+		return response.getJSONArray("notes");
+	}
+
+	public static 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;
+	}
+
+	public ArrayList<Note> getNoteUpdates() throws UnknownHostException, JSONException {
+		ArrayList<Note> updates = new ArrayList<Note>();
+
+		long since = Preferences.getLong(Preferences.Key.LATEST_SYNC_REVISION);
+		JSONObject response = getNoteUpdatesSince(since);
+	
+		JSONArray jsonNotes = response.getJSONArray("notes");
+		for (int i = 0; i < jsonNotes.length(); i++){
+			Note note = new Note(jsonNotes.getJSONObject(i));
+			
+			updates.add(note);
+		}
+
+		return updates;
+	}
+
+	protected JSONObject getNoteUpdatesSince(long since) throws JSONException, UnknownHostException {
+		JSONObject response = new JSONObject(authConnection.get(getNotesUri()
+				+ "?include_notes=true&since="
+				+ since));
+		return response;
+	}
+
+	public Set<String> getNoteIds() throws UnknownHostException, JSONException {
+		Set<String> guids = new HashSet<String>();
+
+		JSONObject response = getAllNotesWithoutContent();
+	
+		JSONArray jsonNotes = response.getJSONArray("notes");
+		for (int i = 0; i < jsonNotes.length(); i++){
+			guids.add(jsonNotes.getJSONObject(i).getString("guid"));
+		}
+
+		return guids;
+	}
+
+	protected JSONObject getAllNotesWithoutContent() throws JSONException, UnknownHostException {
+		String rawResponse = authConnection.get(getNotesUri());
+		JSONObject response = new JSONObject(rawResponse);
+		return response;
+	}
+
+	
+	/**
+	 * @return true if successful
+	 */
+	public boolean createNewRevisionWith(ArrayList<Note> newAndUpdatedNotes) throws JSONException {
+		if (newAndUpdatedNotes.isEmpty()){
+			return true;
+		}
+		
+		JSONArray jsonNotes = new JSONArray();
+		for (Note note : newAndUpdatedNotes) {
+			jsonNotes.put(note.toJson());
+		}
+
+		JSONObject updates = new JSONObject();
+		updates.put("latest-sync-revision", getSyncRevision() + 1);
+		updates.put("note-changes", jsonNotes);
+		
+		long newRevision = upload(updates);
+
+		if (newRevision == getSyncRevision() + 1) {
+			syncVersionOnServer = newRevision;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @return new revision if successful, -1 if not
+	 */
+	protected int upload(JSONObject data){
+		int revision = -1;
+		try {
+			JSONObject response = new JSONObject(authConnection.put(getNotesUri(), data.toString()));
+			revision = response.getInt("latest-sync-revision");
+		} catch (UnknownHostException e) {
+			if (Tomdroid.LOGGING_ENABLED) Log.e(TAG, e.toString());
+		} catch (JSONException e) {
+			if (Tomdroid.LOGGING_ENABLED) Log.e(TAG, e.toString());
+		}
+
+		return revision;
+	}
+
+	
+	public void delete(Set<String> disposedNoteIds) {
+		// TODO Auto-generated method stub
+	}
+
+}

=== modified file 'src/org/tomdroid/ui/PreferencesActivity.java'
--- src/org/tomdroid/ui/PreferencesActivity.java	2010-10-09 19:58:11 +0000
+++ src/org/tomdroid/ui/PreferencesActivity.java	2010-10-10 07:54:44 +0000
@@ -4,6 +4,7 @@
  * http://www.launchpad.net/tomdroid
  * 
  * Copyright 2009, Benoit Garret <[e-mail]>
+ * Copyright 2010, Rodja Trappe <[e-mail]>
  * Copyright 2010, Olivier Bilodeau <[e-mail]>
  * 
  * This file is part of Tomdroid.
@@ -29,7 +30,7 @@
 import org.tomdroid.R;
 import org.tomdroid.sync.ServiceAuth;
 import org.tomdroid.sync.SyncManager;
-import org.tomdroid.sync.SyncService;
+import org.tomdroid.sync.SyncMethod;
 import org.tomdroid.util.FirstNote;
 import org.tomdroid.util.Preferences;
 
@@ -55,8 +56,8 @@
 	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;
+	private EditTextPreference syncServerUriPreference = null;
+	private ListPreference syncMethodPreference = null;	
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -65,25 +66,24 @@
 		addPreferencesFromResource(R.xml.preferences);
 		
 		// Fill the Preferences fields
-		syncServer = (EditTextPreference)findPreference(Preferences.Key.SYNC_SERVER.getName());
-		syncService = (ListPreference)findPreference(Preferences.Key.SYNC_SERVICE.getName());
+		syncServerUriPreference = (EditTextPreference)findPreference(Preferences.Key.SYNC_SERVER_URI.getName());
+		syncMethodPreference = (ListPreference)findPreference(Preferences.Key.SYNC_METHOD.getName());
 		
 		// Set the default values if nothing exists
 		this.setDefaults();
 		
-		// Fill the services combo list
-		this.fillServices();
+		fillSyncServicesList();
 		
 		// Enable or disable the server field depending on the selected sync service
-		setServer(syncService.getValue());
+		updatePreferencesTo(syncMethodPreference.getValue());
 		
-		syncService.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+		syncMethodPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 			
 			public boolean onPreferenceChange(Preference preference, Object newValue) {
 				String selectedSyncServiceKey = (String)newValue;
 				
 				// did the selection change?
-				if (!syncService.getValue().contentEquals(selectedSyncServiceKey)) {
+				if (!syncMethodPreference.getValue().contentEquals(selectedSyncServiceKey)) {
 					Log.d(TAG, "preference change triggered");
 					
 					syncServiceChanged(selectedSyncServiceKey);
@@ -93,7 +93,7 @@
 		});
 		
 		// Re-authenticate if the sync server changes
-		syncServer.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+		syncServerUriPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 
 			public boolean onPreferenceChange(Preference preference,
 					Object serverUri) {
@@ -105,6 +105,9 @@
 					return false;
 				}
 			    
+				// update the value before doing anything
+				Preferences.putString(Preferences.Key.SYNC_SERVER_URI, (String) serverUri);
+				
 				authenticate((String) serverUri);
 				return true;
 			}
@@ -116,11 +119,11 @@
 	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()) {
+		Preferences.putString(Preferences.Key.SYNC_SERVER_URI, serverUri);
+
+		SyncMethod currentSyncMethod = SyncManager.getInstance().getCurrentSyncMethod();
+
+		if (!currentSyncMethod.needsAuth()) {
 			return;
 		}
 
@@ -159,12 +162,12 @@
 			}
 		};
 
-		((ServiceAuth) currentService).getAuthUri(serverUri, handler);
+		((ServiceAuth) currentSyncMethod).getAuthUri(serverUri, handler);
 	}
 	
-	private void fillServices()
+	private void fillSyncServicesList()
 	{
-		ArrayList<SyncService> availableServices = SyncManager.getInstance().getServices();
+		ArrayList<SyncMethod> availableServices = SyncManager.getInstance().getSyncMethods();
 		CharSequence[] entries = new CharSequence[availableServices.size()];
 		CharSequence[] entryValues = new CharSequence[availableServices.size()];
 		
@@ -173,33 +176,32 @@
 			entryValues[i] = availableServices.get(i).getName();
 		}
 		
-		syncService.setEntries(entries);
-		syncService.setEntryValues(entryValues);
+		syncMethodPreference.setEntries(entries);
+		syncMethodPreference.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);
+		String defaultServer = (String)Preferences.Key.SYNC_SERVER_URI.getDefault();
+		syncServerUriPreference.setDefaultValue(defaultServer);
+		if(syncServerUriPreference.getText() == null)
+			syncServerUriPreference.setText(defaultServer);
+		
+		String defaultService = (String)Preferences.Key.SYNC_METHOD.getDefault();
+		syncMethodPreference.setDefaultValue(defaultService);
+		if(syncMethodPreference.getValue() == null)
+			syncMethodPreference.setValue(defaultService);
+	}
 	
-	}
-
-	private void setServer(String syncServiceKey) {
-
-		SyncService service = SyncManager.getInstance().getService(syncServiceKey);
-
-		if (service == null)
+	private void updatePreferencesTo(String syncMethodName) {
+		
+		SyncMethod syncMethod = SyncManager.getInstance().getSyncMethod(syncMethodName);
+
+		if (syncMethod == null)
 			return;
 
-		syncServer.setEnabled(service.needsServer());
-		syncService.setSummary(service.getDescription());
+		syncServerUriPreference.setEnabled(syncMethod.needsServer());
+		syncMethodPreference.setSummary(syncMethod.getDescription());
 	}
 		
 	private void connectionFailed() {
@@ -224,22 +226,23 @@
 	
 	/**
 	 * Housekeeping when a syncServer changes
-	 * @param syncServiceKey - key of the new sync service 
+	 * @param syncMethodKey - key of the new sync service 
 	 */
-	private void syncServiceChanged(String syncServiceKey) {
+	private void syncServiceChanged(String syncMethodKey) {
 		
-		setServer(syncServiceKey);
+		updatePreferencesTo(syncMethodKey);
 		
 		// TODO this should be refactored further, notice that setServer performs the same operations 
-		SyncService service = SyncManager.getInstance().getService(syncServiceKey);
+		SyncMethod syncMethod = SyncManager.getInstance().getSyncMethod(
+				syncMethodKey);
 		
-		if (service == null)
+		if (syncMethod == null)
 			return;
 
 		// reset if no-auth required
 		// I believe it's done this way because if needsAuth the database is reset when they successfully auth for the first time
 		// TODO we should graphically warn the user that his database is about to be dropped
-		if (!service.needsAuth()){
+		if (!syncMethod.needsAuth()){
 		    resetLocalDatabase();
 		}
 	}

=== added file 'src/org/tomdroid/ui/Rotate3dAnimation.java'
--- src/org/tomdroid/ui/Rotate3dAnimation.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/ui/Rotate3dAnimation.java	2010-10-10 07:54:44 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.tomdroid.ui;
+
+import android.view.animation.Animation;
+import android.view.animation.Transformation;
+import android.graphics.Camera;
+import android.graphics.Matrix;
+
+/**
+ * An animation that rotates the view on the Y axis between two specified angles.
+ * This animation also adds a translation on the Z axis (depth) to improve the effect.
+ */
+public class Rotate3dAnimation extends Animation {
+    private final float mFromDegrees;
+    private final float mToDegrees;
+    private final float mCenterX;
+    private final float mCenterY;
+    private final float mDepthZ;
+    private final boolean mReverse;
+    private Camera mCamera;
+
+    /**
+     * Creates a new 3D rotation on the Y axis. The rotation is defined by its
+     * start angle and its end angle. Both angles are in degrees. The rotation
+     * is performed around a center point on the 2D space, definied by a pair
+     * of X and Y coordinates, called centerX and centerY. When the animation
+     * starts, a translation on the Z axis (depth) is performed. The length
+     * of the translation can be specified, as well as whether the translation
+     * should be reversed in time.
+     *
+     * @param fromDegrees the start angle of the 3D rotation
+     * @param toDegrees the end angle of the 3D rotation
+     * @param centerX the X center of the 3D rotation
+     * @param centerY the Y center of the 3D rotation
+     * @param reverse true if the translation should be reversed, false otherwise
+     */
+    public Rotate3dAnimation(float fromDegrees, float toDegrees,
+            float centerX, float centerY, float depthZ, boolean reverse) {
+        mFromDegrees = fromDegrees;
+        mToDegrees = toDegrees;
+        mCenterX = centerX;
+        mCenterY = centerY;
+        mDepthZ = depthZ;
+        mReverse = reverse;
+    }
+
+    @Override
+    public void initialize(int width, int height, int parentWidth, int parentHeight) {
+        super.initialize(width, height, parentWidth, parentHeight);
+        mCamera = new Camera();
+    }
+
+    @Override
+    protected void applyTransformation(float interpolatedTime, Transformation t) {
+        final float fromDegrees = mFromDegrees;
+        float degrees = fromDegrees + ((mToDegrees - fromDegrees) * interpolatedTime);
+
+        final float centerX = mCenterX;
+        final float centerY = mCenterY;
+        final Camera camera = mCamera;
+
+        final Matrix matrix = t.getMatrix();
+
+        camera.save();
+        if (mReverse) {
+            camera.translate(0.0f, 0.0f, mDepthZ * interpolatedTime);
+        } else {
+            camera.translate(0.0f, 0.0f, mDepthZ * (1.0f - interpolatedTime));
+        }
+        camera.rotateY(degrees);
+        camera.getMatrix(matrix);
+        camera.restore();
+
+        matrix.preTranslate(-centerX, -centerY);
+        matrix.postTranslate(centerX, centerY);
+    }
+}

=== modified file 'src/org/tomdroid/ui/SyncMessageHandler.java'
--- src/org/tomdroid/ui/SyncMessageHandler.java	2010-08-25 19:43:16 +0000
+++ src/org/tomdroid/ui/SyncMessageHandler.java	2010-10-10 07:54:44 +0000
@@ -24,7 +24,7 @@
 
 import org.tomdroid.R;
 import org.tomdroid.sync.SyncManager;
-import org.tomdroid.sync.SyncService;
+import org.tomdroid.sync.SyncMethod;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -56,25 +56,25 @@
 	public void handleMessage(Message msg) {
 
 		switch (msg.what) {
-			case SyncService.PARSING_COMPLETE:
+			case SyncMethod.PARSING_COMPLETE:
 				// TODO put string in a translatable bundle
 				Toast.makeText(
 						activity,
 						"Synchronization with "
-								+ SyncManager.getInstance().getCurrentService().getDescription()
+								+ SyncManager.getInstance().getCurrentSyncMethod().getDescription()
 								+ " is complete.", Toast.LENGTH_SHORT).show();
 				break;
 
-			case SyncService.PARSING_NO_NOTES:
+			case SyncMethod.PARSING_NO_NOTES:
 				// TODO put string in a translatable bundle
 				Toast.makeText(
 						activity,
 						"No notes found on "
-								+ SyncManager.getInstance().getCurrentService().getDescription()
+								+ SyncManager.getInstance().getCurrentSyncMethod().getDescription()
 								+ ".", Toast.LENGTH_SHORT).show();
 				break;
 
-			case SyncService.PARSING_FAILED:
+			case SyncMethod.PARSING_FAILED:
 				if (Tomdroid.LOGGING_ENABLED)
 					Log.w(TAG, "handler called with a parsing failed message");
 
@@ -95,13 +95,13 @@
 				}
 				break;
 
-			case SyncService.NO_INTERNET:
+			case SyncMethod.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:
+			case SyncMethod.SYNC_PROGRESS:
 				handleSyncProgress(msg);
 				break;
 

=== modified file 'src/org/tomdroid/ui/Tomdroid.java'
--- src/org/tomdroid/ui/Tomdroid.java	2010-10-09 19:58:11 +0000
+++ src/org/tomdroid/ui/Tomdroid.java	2010-10-10 07:54:44 +0000
@@ -27,9 +27,10 @@
 import org.tomdroid.Note;
 import org.tomdroid.NoteManager;
 import org.tomdroid.R;
+import org.tomdroid.sync.LocalStorage;
 import org.tomdroid.sync.ServiceAuth;
 import org.tomdroid.sync.SyncManager;
-import org.tomdroid.sync.SyncService;
+import org.tomdroid.sync.SyncMethod;
 import org.tomdroid.util.FirstNote;
 import org.tomdroid.util.Preferences;
 
@@ -71,7 +72,7 @@
 	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		= true;
 	// Set this to false for release builds, the reason should be obvious
 	public static final boolean	CLEAR_PREFERENCES	= false;
 
@@ -83,8 +84,8 @@
 	private ListAdapter			adapter;
 
 	// UI feedback handler
-	private Handler	syncMessageHandler	= new SyncMessageHandler(this);
-	
+	private final Handler				syncMessageHandler	= new SyncMessageHandler(this);
+
 	/** Called when the activity is created. */
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -137,6 +138,11 @@
 				showAboutDialog();
 				return true;
 
+			case R.id.menuRevert:
+				LocalStorage localStorage = new LocalStorage(this);
+				localStorage.resetDatabase();
+				return true;
+
 			case R.id.menuPrefs:
 				startActivity(new Intent(this, PreferencesActivity.class));
 				return true;
@@ -145,34 +151,37 @@
 		return super.onOptionsItemSelected(item);
 	}
 
+	@Override
 	public void onResume() {
 		super.onResume();
 		Intent intent = this.getIntent();
 
-		SyncService currentService = SyncManager.getInstance().getCurrentService();
-		
-		if (currentService.needsAuth() && intent != null) {
+		if (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);
+				SyncMethod currentSyncMethod = SyncManager.getInstance().getCurrentSyncMethod();
+
+				if (currentSyncMethod.needsAuth()) {
+					final ProgressDialog dialog = ProgressDialog.show(this, "",
+							"Completing authentication. Please wait...", true, false);
+					
+					Handler handler = new Handler() {
+						
+						@Override
+						public void handleMessage(Message msg) {
+							dialog.dismiss();
+						}
+						
+					};
+
+					// the user has completed the remote auth, do the third part
+					((ServiceAuth) currentSyncMethod).remoteAuthComplete(uri, handler);
+				}
 			}
 		}
-		
+
 		SyncManager.setActivity(this);
 		SyncManager.setHandler(this.syncMessageHandler);
 	}
@@ -190,7 +199,7 @@
 
 		// format the string
 		String aboutDialogFormat = getString(R.string.strAbout);
-		String aboutDialogStr = String.format(aboutDialogFormat, getString(R.string.app_desc), // App description
+		String aboutDialogStr = String.format(aboutDialogFormat, getString(R.string.app_desc), 
 				getString(R.string.author), // Author name
 				ver // Version
 				);

=== modified file 'src/org/tomdroid/ui/ViewNote.java'
--- src/org/tomdroid/ui/ViewNote.java	2010-10-09 19:54:14 +0000
+++ src/org/tomdroid/ui/ViewNote.java	2010-10-10 07:54:44 +0000
@@ -5,6 +5,7 @@
  * 
  * Copyright 2008, 2009, 2010 Olivier Bilodeau <[e-mail]>
  * Copyright 2009, Benoit Garret <[e-mail]>
+ * Copyright 2010, Rodja Trappe <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -29,17 +30,18 @@
 import org.tomdroid.Note;
 import org.tomdroid.NoteManager;
 import org.tomdroid.R;
+import org.tomdroid.sync.LocalStorage;
 import org.tomdroid.sync.SyncManager;
 import org.tomdroid.util.LinkifyPhone;
 import org.tomdroid.util.NoteContentBuilder;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 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;
@@ -48,65 +50,90 @@
 import android.text.util.Linkify;
 import android.text.util.Linkify.TransformFilter;
 import android.util.Log;
-import android.view.KeyEvent;
+import android.view.GestureDetector;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
+import android.widget.Toast;
 
 // TODO this class is starting to smell
 public class ViewNote extends Activity {
-	
+
 	// UI elements
-	private TextView title;
-	private TextView content;
-	
+	private ViewGroup container;
+
 	// Model objects
 	private Note note;
 	private SpannableStringBuilder noteContent;
-	
+
 	// Logging info
 	private static final String TAG = "ViewNote";
-	
+
 	// UI feedback handler
-	private Handler	syncMessageHandler	= new SyncMessageHandler(this);
+	private final Handler syncMessageHandler = new SyncMessageHandler(this);
+
+	private LocalStorage localStorage;
+	private ViewSwitcher viewSwitcher;
+	private GestureDetector gestureDetector;
 
 	// TODO extract methods in here
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		
+
 		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);
-		
+		container = (ViewGroup) findViewById(R.id.container);
+
 		final Intent intent = getIntent();
-		Uri uri = intent.getData();
-		
+		handleUri(intent.getData());
+
+		localStorage = new LocalStorage(this);
+		viewSwitcher = new ViewSwitcher(container);
+
+		gestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
+
+			@Override
+			public boolean onDoubleTap(MotionEvent e) {
+				if (isInViewMode())
+					switchToEditMode();
+				else
+					switchToViewMode();
+				return true;
+			}
+		});
+
+		viewNote();
+	}
+
+	@Override
+	public boolean dispatchTouchEvent(MotionEvent event) {
+		if (gestureDetector.onTouchEvent(event))
+			return true;
+		return super.dispatchTouchEvent(event);
+	}
+
+	private void handleUri(Uri uri) {
 		if (uri != null) {
-			
-			// We were triggered by an Intent URI 
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "ViewNote started: Intent-filter triggered.");
+
+			// We were triggered by an Intent URI
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.d(TAG, "ViewNote started: Intent-filter triggered.");
 
 			// TODO validate the good action?
 			// intent.getAction()
-			
+
 			// TODO verify that getNote is doing the proper validation
 			note = NoteManager.getNote(this, uri);
-			
-			if(note != null) {
-				
-				noteContent = note.getNoteContent(noteContentHandler);
-				
-				//Log.i(TAG, "THE NOTE IS: " + note.getXmlContent().toString());
-				
-			} else {
-				
-				if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "The note "+uri+" doesn't exist");
-				
+
+			if (note == null) {
+
+				if (Tomdroid.LOGGING_ENABLED)
+					Log.d(TAG, "The note " + uri + " doesn't exist");
+
 				// TODO put error string in a translatable resource
 				new AlertDialog.Builder(this)
 					.setMessage("The requested note could not be found. If you see this error " +
@@ -119,10 +146,12 @@
 						}})
 					.show();
 			}
+		
 		} else {
-			
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "The Intent's data was null.");
-			
+
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.d(TAG, "The Intent's data was null.");
+
 			// TODO put error string in a translatable resource
 			new AlertDialog.Builder(this)
 			.setMessage("The requested note could not be found. If you see this error " +
@@ -136,75 +165,164 @@
 			.show();
 		}
 	}
-	
+
 	@Override
-	public void onResume(){
+	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)
-	
-	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		// TODO Auto-generated method stub
-		super.onKeyDown(keyCode, event);
-		
-		finish();
-		
-		return true;
-	}
-	
-	private void showNote() {
-		//setTitle(note.getTitle());
-
+	@Override
+	public void onPause() {
+		super.onPause();
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+
+		MenuInflater inflater = getMenuInflater();
+		inflater.inflate(R.menu.view_note, menu);
+		menu.findItem(R.id.menuView).setVisible(false);
+		return true;
+	}
+
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu) {
+		if (isInEditMode()) {
+			menu.findItem(R.id.menuEdit).setVisible(false);
+			menu.findItem(R.id.menuView).setVisible(true);
+		} else {
+			menu.findItem(R.id.menuEdit).setVisible(true);
+			menu.findItem(R.id.menuView).setVisible(false);
+		}
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case R.id.menuDelete:
+				Toast.makeText(this, "deleting notes is not jet ipmlemented", Toast.LENGTH_SHORT)
+						.show();
+				return true;
+			case R.id.menuView:
+				switchToViewMode();
+				return true;
+			case R.id.menuEdit:
+				switchToEditMode();
+				return true;
+			case R.id.menuPrefs:
+				startActivity(new Intent(this, PreferencesActivity.class));
+				return true;
+		}
+
+		return super.onOptionsItemSelected(item);
+	}
+
+	private void saveEditedContent() {
+		TextView textView = (TextView) findViewById(R.id.editContent);
+		if (!textView.getText().toString().equals(note.getXmlContent())) {
+			note.changeXmlContent(textView.getText().toString());
+			localStorage.insertNote(note);
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.v(TAG, textView.getText().toString() + "\n----\n" + note.getXmlContent());
+
+		}
+	}
+
+	private boolean isInEditMode() {
+		return viewSwitcher.isBacksideVisible();
+	}
+
+	private boolean isInViewMode() {
+		return viewSwitcher.isFrontsideVisible();
+	}
+
+	private void switchToEditMode() {
+		if (isInEditMode()) {
+			return;
+		}
+		viewSwitcher.swap();
+
+		editNote();
+	}
+
+	private void switchToViewMode() {
+		if (isInViewMode()) {
+			return;
+		}
+		saveEditedContent();
+		viewSwitcher.swap();
+		InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(),
+				InputMethodManager.HIDE_NOT_ALWAYS);
+		viewNote();
+	}
+
+	private void viewNote() {
+
+		setTitle(note.getTitle());
+		noteContent = note.getNoteContent(NoteContentHandler);
+	}
+
+	private void onContentBuilded() {
 		// get rid of the title that is doubled in the note's content
 		// using quote to escape potential regexp chars in pattern
-		Pattern removeTitle = Pattern.compile("^\\s*"+Pattern.quote(note.getTitle())+"\\n\\n"); 
+		Pattern removeTitle = Pattern.compile("^\\s*" + Pattern.quote(note.getTitle()) + "\\n\\n");
 		Matcher m = removeTitle.matcher(noteContent);
 		if (m.find()) {
 			noteContent = noteContent.replace(0, m.end(), "");
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "stripped the title from note-content");
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.d(TAG, "stripped the title from note-content");
 		}
-		
+
+		TextView textView = (TextView) findViewById(R.id.viewContent);
+
 		// 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
+		textView.setText(noteContent, TextView.BufferType.SPANNABLE);
+		// add links to stuff that is understood by Android except phone numbers because it's too
+		// aggressive
+
 		// TODO this is SLOWWWW!!!!
-		Linkify.addLinks(content, Linkify.EMAIL_ADDRESSES|Linkify.WEB_URLS|Linkify.MAP_ADDRESSES);
-		
+		Linkify.addLinks(textView, Linkify.EMAIL_ADDRESSES | Linkify.WEB_URLS
+				| Linkify.MAP_ADDRESSES);
+
 		// Custom phone number linkifier (fixes lp:512204)
-		Linkify.addLinks(content, LinkifyPhone.PHONE_PATTERN, "tel:", LinkifyPhone.sPhoneNumberMatchFilter, Linkify.sPhoneNumberTransformFilter);
-		
+		Linkify.addLinks(textView, LinkifyPhone.PHONE_PATTERN, "tel:",
+				LinkifyPhone.sPhoneNumberMatchFilter, Linkify.sPhoneNumberTransformFilter);
+
 		// This will create a link every time a note title is found in the text.
 		// The pattern contains a very dumb (title1)|(title2) escaped correctly
-		// Then we transform the url from the note name to the note id to avoid characters that mess up with the URI (ex: ?)
-		Linkify.addLinks(content, 
-						 buildNoteLinkifyPattern(),
-						 Tomdroid.CONTENT_URI+"/",
-						 null,
-						 noteTitleTransformFilter);
-	}
-	
-	public void setTitle(CharSequence title){
+		// Then we transform the url from the note name to the note id to avoid characters that mess
+		// up with the URI (ex: ?)
+		Linkify.addLinks(textView, buildNoteLinkifyPattern(), Tomdroid.CONTENT_URI + "/", null,
+				noteTitleTransformFilter);
+	}
+
+	private void editNote() {
+		setTitle("Edit Mode");
+
+		TextView textView = (TextView) findViewById(R.id.editContent);
+
+		textView.setText(note.getXmlContent());
+	}
+
+	@Override
+	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() {
+
+	private final Handler NoteContentHandler = new Handler() {
 
 		@Override
 		public void handleMessage(Message msg) {
-			
 			//parsed ok - show
 			if(msg.what == NoteContentBuilder.PARSE_OK) {
-				showNote();
+				onContentBuilded();
 
 			//parsed not ok - error
 			} else if(msg.what == NoteContentBuilder.PARSE_ERROR) {
@@ -223,57 +341,64 @@
         	}
 		}
 	};
-	
+
 	/**
-	 * Builds a regular expression pattern that will match any of the note title currently in the collection.
-	 * Useful for the Linkify to create the links to the notes.
+	 * Builds a regular expression pattern that will match any of the note title currently in the
+	 * collection. Useful for the Linkify to create the links to the notes.
+	 * 
 	 * @return regexp pattern
 	 */
-	private Pattern buildNoteLinkifyPattern()  {
-		
+	private Pattern buildNoteLinkifyPattern() {
+
 		StringBuilder sb = new StringBuilder();
 		Cursor cursor = NoteManager.getTitles(this);
-		
-		// cursor must not be null and must return more than 0 entry 
+
+		// cursor must not be null and must return more than 0 entry
 		if (!(cursor == null || cursor.getCount() == 0)) {
-			
+
 			String title;
-			
+
 			cursor.moveToFirst();
-			
+
 			do {
 				title = cursor.getString(cursor.getColumnIndexOrThrow(Note.TITLE));
-				
-				// Pattern.quote() here make sure that special characters in the note's title are properly escaped 
-				sb.append("("+Pattern.quote(title)+")|");
-				
+
+				// Pattern.quote() here make sure that special characters in the note's title are
+				// properly escaped
+				sb.append("(" + Pattern.quote(title) + ")|");
+
 			} while (cursor.moveToNext());
-			
+
 			// get rid of the last | that is not needed (I know, its ugly.. better idea?)
-			String pt = sb.substring(0, sb.length()-1);
+			String pt = sb.substring(0, sb.length() - 1);
 
 			// return a compiled match pattern
 			return Pattern.compile(pt);
-			
+
 		} else {
-			
+
 			// TODO send an error to the user
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "Cursor returned null or 0 notes");
+			if (Tomdroid.LOGGING_ENABLED)
+				Log.d(TAG, "Cursor returned null or 0 notes");
 		}
-		
+
 		return null;
 	}
-	
-	// custom transform filter that takes the note's title part of the URI and translate it into the note id
-	// this was done to avoid problems with invalid characters in URI (ex: ? is the query separator but could be in a note title)
-	private TransformFilter noteTitleTransformFilter = new TransformFilter() {
+
+	// custom transform filter that takes the note's title part of the URI and translate it into the
+	// note id
+	// this was done to avoid problems with invalid characters in URI (ex: ? is the query separator
+	// but could be in a note title)
+	private final TransformFilter noteTitleTransformFilter = new TransformFilter() {
 
 		public String transformUrl(Matcher m, String str) {
 
 			int id = NoteManager.getNoteId(ViewNote.this, str);
-			
-			// return something like content://org.tomdroid.notes/notes/3
-			return Tomdroid.CONTENT_URI.toString()+"/"+id;
-		}  
+
+			// return something
+			// like
+			// content://org.tomdroid.notes/notes/3
+			return Tomdroid.CONTENT_URI.toString() + "/" + id;
+		}
 	};
 }

=== added file 'src/org/tomdroid/ui/ViewSwitcher.java'
--- src/org/tomdroid/ui/ViewSwitcher.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/ui/ViewSwitcher.java	2010-10-10 07:54:44 +0000
@@ -0,0 +1,152 @@
+/*
+ * 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 android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.Animation;
+import android.view.animation.DecelerateInterpolator;
+
+/**
+ * This code was extracted from the Transition3D sample activity found in the Android ApiDemos. The
+ * animation is made of two smaller animations: the first half rotates the list by 90 degrees on the
+ * Y axis and the second half rotates the picture by 90 degrees on the Y axis. When the first half
+ * finishes, the list is made invisible and the picture is set visible.
+ */
+public class ViewSwitcher {
+	private static final String	TAG					= "ViewSwitcher";
+	private ViewGroup			mContainer;
+	private View				mFrondside;
+	private View				mBackside;
+
+	private long				mDuration			= 300;
+	private float				mDepthOfRotation	= 300f;
+
+	public ViewSwitcher(ViewGroup container) {
+
+		mContainer = container;
+		mFrondside = container.getChildAt(0);
+		mBackside = container.getChildAt(1);
+
+		// Since we are caching large views, we want to keep their cache
+		// between each animation
+		mContainer.setPersistentDrawingCache(ViewGroup.PERSISTENT_ANIMATION_CACHE);
+
+	}
+
+	public void setDuration(long duration) {
+		mDuration = duration;
+	}
+
+	public void swap() {
+		float start, end;
+
+		if (isFrontsideVisible()) {
+			Log.v(TAG, "turning to the backside!");
+			start = 0;
+			end = 90;
+		} else {
+			Log.v(TAG, "turning to the frontside!");
+			start = 180;
+			end = 90;
+		}
+
+		Rotate3dAnimation rotation = new Rotate3dAnimation(start, end,
+				mContainer.getWidth() / 2.0f, mContainer.getHeight() / 2.0f, mDepthOfRotation, true);
+		rotation.setDuration(mDuration / 2);
+		rotation.setFillAfter(true);
+		rotation.setInterpolator(new AccelerateInterpolator());
+		rotation.setAnimationListener(new TurnAroundListener());
+
+		mContainer.startAnimation(rotation);
+	}
+
+	public boolean isFrontsideVisible() {
+		return mFrondside.getVisibility() == View.VISIBLE;
+	}
+
+	public boolean isBacksideVisible() {
+		return mBackside.getVisibility() == View.VISIBLE;
+	}
+
+	/**
+	 * Listen for the end of the first half of the animation. Then post a new action that
+	 * effectively swaps the views when the container is rotated 90 degrees and thus invisible.
+	 */
+	private final class TurnAroundListener implements Animation.AnimationListener {
+
+		public void onAnimationStart(Animation animation) {
+		}
+
+		public void onAnimationEnd(Animation animation) {
+			mContainer.post(new SwapViews());
+		}
+
+		public void onAnimationRepeat(Animation animation) {
+		}
+	}
+
+	/**
+	 * Swapping the views and start the second half of the animation.
+	 */
+	private final class SwapViews implements Runnable {
+
+		public void run() {
+			final float centerX = mContainer.getWidth() / 2.0f;
+			final float centerY = mContainer.getHeight() / 2.0f;
+			Rotate3dAnimation rotation;
+
+			if (isFrontsideVisible()) {
+				mFrondside.setVisibility(View.GONE);
+				mBackside.setVisibility(View.VISIBLE);
+				unmirrorTheBackside();
+				mBackside.requestFocus();
+
+				rotation = new Rotate3dAnimation(90, 180, centerX, centerY, mDepthOfRotation, false);
+			} else {
+				mBackside.setVisibility(View.GONE);
+				mBackside.clearAnimation(); // remove the mirroring
+				mFrondside.setVisibility(View.VISIBLE);
+				mFrondside.requestFocus();
+
+				rotation = new Rotate3dAnimation(90, 0, centerX, centerY, mDepthOfRotation, false);
+			}
+
+			rotation.setDuration(mDuration / 2);
+			rotation.setFillAfter(true);
+			rotation.setInterpolator(new DecelerateInterpolator());
+
+			mContainer.startAnimation(rotation);
+		}
+	}
+
+	private void unmirrorTheBackside() {
+		Rotate3dAnimation rotation = new Rotate3dAnimation(0, 180, mContainer.getWidth() / 2.0f,
+				mContainer.getHeight() / 2.0f, mDepthOfRotation, false);
+		rotation.setDuration(0);
+		rotation.setFillAfter(true);
+		mBackside.startAnimation(rotation);
+	}
+}

=== modified file 'src/org/tomdroid/util/NoteListCursorAdapter.java'
--- src/org/tomdroid/util/NoteListCursorAdapter.java	2010-10-09 19:45:06 +0000
+++ src/org/tomdroid/util/NoteListCursorAdapter.java	2010-10-10 07:54:44 +0000
@@ -4,6 +4,7 @@
  * http://www.launchpad.net/tomdroid
  * 
  * Copyright 2010, Matthew Stevenson <[e-mail]>
+ * Copyright 2010, Rodja Trappe <[e-mail]>
  * 
  * This file is part of Tomdroid.
  * 
@@ -42,11 +43,11 @@
 
 public class NoteListCursorAdapter extends SimpleCursorAdapter {
 
-    private int layout;
-    private int[] colors = new int[] { 0xFFFFFFFF, 0xFFEEEEEE };
+    private final int layout;
+    private final int[] colors = new int[] { 0xFFFFFFFF, 0xFFEEEEEE };
 
-    private DateFormat localeDateFormat;
-    private DateFormat localeTimeFormat;
+    private final DateFormat localeDateFormat;
+    private final DateFormat localeTimeFormat;
 
     public NoteListCursorAdapter (Context context, int layout, Cursor c, String[] from, int[] to) {
         super(context, layout, c, from, to);
@@ -98,7 +99,8 @@
         Long lastModifiedMillis = lastModified.toMillis(false);
         Date lastModifiedDate = new Date(lastModifiedMillis);
         
-        String strModified = "Modified: ";
+        boolean isSynced = c.getInt(c.getColumnIndex(Note.IS_SYNCED)) != 0;
+        String strModified = (isSynced ? "" : "Locally ") + "Modified: ";
         //TODO this is very inefficient
         if (DateUtils.isToday(lastModifiedMillis)){
         	strModified += "Today, " + localeTimeFormat.format(lastModifiedDate);

=== modified file 'src/org/tomdroid/util/Preferences.java'
--- src/org/tomdroid/util/Preferences.java	2010-09-26 19:57:31 +0000
+++ src/org/tomdroid/util/Preferences.java	2010-10-10 07:54:44 +0000
@@ -29,10 +29,10 @@
 public class Preferences {
 	
 	public enum Key {
-		SYNC_SERVICE ("sync_service", "sdcard"),
+		SYNC_METHOD ("sync_method", "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"),
+		SYNC_SERVER_URI ("sync_server_uri", "https://one.ubuntu.com/notes"),
 		ACCESS_TOKEN ("access_token", ""),
 		ACCESS_TOKEN_SECRET ("access_token_secret", ""),
 		REQUEST_TOKEN ("request_token", ""),

=== added directory 'tests/org/tomdroid/sync'
=== added file 'tests/org/tomdroid/sync/TestLocalStorage.java'
--- tests/org/tomdroid/sync/TestLocalStorage.java	1970-01-01 00:00:00 +0000
+++ tests/org/tomdroid/sync/TestLocalStorage.java	2010-10-10 07:54:44 +0000
@@ -0,0 +1,78 @@
+/*
+ * 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.sync;
+
+import org.tomdroid.Note;
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.Preferences;
+
+import android.content.Intent;
+import android.test.ActivityUnitTestCase;
+
+public class TestLocalStorage extends ActivityUnitTestCase<Tomdroid> {
+
+	private LocalStorage		localStorage;
+
+	public TestLocalStorage() {
+		super(Tomdroid.class);
+	}
+	
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		Preferences.init(getInstrumentation().getContext(), false);
+
+		startActivity(new Intent(), null, null);
+		localStorage = new LocalStorage(getActivity());
+		localStorage.resetDatabase();
+	}
+
+	@Override
+	public void tearDown() {
+		localStorage.resetDatabase();
+	}
+
+	protected LocalStorage getLocalStorage(){
+		return localStorage;
+	}
+
+	public void testOutOfSyncFlagStoringInContentProvider(){
+		
+		Note note = new Note();
+		note.setTitle("title");
+		note.setXmlContent("content");
+		note.isSynced(true);
+		assertTrue("default should be 'in sync'", note.isSynced());
+		getLocalStorage().insertNote(note);
+		note = getLocalStorage().getNote(note.getGuid());
+		assertTrue("should still be 'in sync'", note.isSynced());
+
+		note.changeXmlContent("modified content");
+		assertFalse("should be 'out of sync'", note.isSynced());
+		getLocalStorage().insertNote(note);
+		note = getLocalStorage().getNote(note.getGuid());
+		assertFalse("locally stored note should still marked as 'out of sync with server'", note
+				.isSynced());
+
+	}
+}
\ No newline at end of file

=== added directory 'tests/org/tomdroid/sync/web'
=== added file 'tests/org/tomdroid/sync/web/MockSyncServer.java'
--- tests/org/tomdroid/sync/web/MockSyncServer.java	1970-01-01 00:00:00 +0000
+++ tests/org/tomdroid/sync/web/MockSyncServer.java	2010-10-10 07:54:44 +0000
@@ -0,0 +1,167 @@
+/*
+ * 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.sync.web;
+
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.NoSuchElementException;
+import java.util.UUID;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.tomdroid.Note;
+
+public class MockSyncServer extends SyncServer {
+
+	HashMap<UUID, Note>		storedNotes			= new HashMap<UUID, Note>();
+	private ArrayList<Note>	noteUpdates			= new ArrayList<Note>();
+
+	TestDataManipulator		testDataManipulator	= new TestDataManipulator();
+	private boolean			isStoringLocked;
+
+	public MockSyncServer() throws UnknownHostException, JSONException {
+		super();
+	}
+
+	@Override
+	protected JSONObject getMetadata() throws JSONException {
+		JSONObject mockedResponse = new JSONObject(
+				"{'user-name':'<in reality this is a http address>',"
+						+ "'notes-ref':{'api-ref':'https://one.ubuntu.com/notes/api/1.0/op/',"
+						+ "'href':'https://one.ubuntu.com/notes/'}," + "'current-sync-guid':'0',"
+						+ "'last-name':'Mustermann','first-name':'Max','latest-sync-revision':0}");
+		return mockedResponse;
+	}
+
+	@Override
+	protected JSONObject getNoteUpdatesSince(long since) throws JSONException, UnknownHostException {
+		JSONArray notes = new JSONArray();
+		for (int i = (int) since; i < noteUpdates.size(); i++) {
+			notes.put(noteUpdates.get(i).toJson());
+		}
+
+		JSONObject updates = new JSONObject();
+		updates.put("notes", notes);
+		return updates;
+	}
+
+	@Override
+	protected JSONObject getAllNotesWithoutContent() throws JSONException, UnknownHostException {
+		JSONArray notes = new JSONArray();
+		for (Note note : storedNotes.values()) {
+			notes.put(note.toJsonWithoutContent());
+		}
+
+		JSONObject data = new JSONObject();
+		data.put("notes", notes);
+		return data;
+	}
+
+	@Override
+	public boolean createNewRevisionWith(ArrayList<Note> newAndUpdatedNotes) {
+		if (isStoringLocked)
+			return false;
+
+		for (Note note : newAndUpdatedNotes) {
+			storedNotes.put(note.getGuid(), note);
+			noteUpdates.add(note.clone());
+		}
+		return true;
+	}
+
+	public void lockStoring() {
+		isStoringLocked = true;
+	}
+
+	public void unlockStoring() {
+		isStoringLocked = false;
+	}
+
+	class TestDataManipulator {
+
+		private void onStoredDataChanged() {
+			syncVersionOnServer++;
+		}
+
+		public Note createNewNote() {
+			onStoredDataChanged();
+			Note note = new Note();
+			note.setTitle("A Title");
+			note.setGuid(UUID.randomUUID());
+			note.changeXmlContent("Note content.");
+			note.setLastSyncRevision(syncVersionOnServer);
+
+			storedNotes.put(note.getGuid(), note);
+			noteUpdates.add(note.clone());
+			return note;
+		}
+
+		public Note getNewestNote() {
+			Note newestNote = null;
+			for (Note note : storedNotes.values()) {
+				if (newestNote != null
+						&& note.getLastChangeDate().toMillis(false) > newestNote
+								.getLastChangeDate().toMillis(false)) {
+
+				} else {
+					newestNote = note;
+				}
+			}
+			return newestNote;
+		}
+
+		public Note setTitleOfNewestNote(String title) {
+			onStoredDataChanged();
+
+			Note note = getNewestNote();
+			note.setTitle(title);
+			note.setLastSyncRevision(syncVersionOnServer);
+
+			noteUpdates.add(note.clone());
+			return note;
+		}
+
+		public Note setContentOfNewestNote(String content) {
+			onStoredDataChanged();
+			Note note = getNewestNote();
+			note.setLastSyncRevision(syncVersionOnServer);
+			note.changeXmlContent(content);
+			noteUpdates.add(note.clone());
+			return note;
+		}
+
+		public void deleteNote(UUID guid) {
+			storedNotes.remove(guid);
+			onStoredDataChanged();
+		}
+
+		public Note getNote(UUID guid) {
+			if (!storedNotes.containsKey(guid))
+				throw new NoSuchElementException();
+
+			return storedNotes.get(guid);
+		}
+	}
+}

=== added file 'tests/org/tomdroid/sync/web/MockedSyncServerTestCase.java'
--- tests/org/tomdroid/sync/web/MockedSyncServerTestCase.java	1970-01-01 00:00:00 +0000
+++ tests/org/tomdroid/sync/web/MockedSyncServerTestCase.java	2010-10-10 07:54:44 +0000
@@ -0,0 +1,81 @@
+/*
+ * 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.sync.web;
+
+import org.json.JSONException;
+import org.tomdroid.Note;
+import org.tomdroid.sync.LocalStorage;
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.Preferences;
+
+import android.content.Intent;
+import android.os.Handler;
+import android.test.ActivityUnitTestCase;
+
+public class MockedSyncServerTestCase  extends ActivityUnitTestCase<Tomdroid> {
+
+	private LocalStorage		localStorage;
+	private MockSyncServer		server;
+	private SnowySyncMethod		syncMethod;
+
+	public MockedSyncServerTestCase() {
+		super(Tomdroid.class);
+	}	
+
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		Preferences.init(getInstrumentation().getContext(), false);
+
+		startActivity(new Intent(), null, null);
+		syncMethod = new SnowySyncMethod(getActivity(), new Handler() {
+		});
+
+		localStorage = new LocalStorage(getActivity());
+		localStorage.resetDatabase();
+
+		server = new MockSyncServer();
+	}
+
+	@Override
+	public void tearDown() {
+		localStorage.resetDatabase();
+	}
+
+	protected MockSyncServer getServer(){
+		return server;
+	}
+
+	protected SnowySyncMethod getSyncMethod(){
+		return syncMethod;
+	}
+
+	protected LocalStorage getLocalStorage(){
+		return localStorage;
+	}
+
+	protected void assertEquals(Note expected, Note actual) throws JSONException {
+		assertEquals("notes should be the same", expected.toJson().toString(), actual.toJson()
+				.toString());
+	}
+}

=== added file 'tests/org/tomdroid/sync/web/TestFetchingFromServer.java'
--- tests/org/tomdroid/sync/web/TestFetchingFromServer.java	1970-01-01 00:00:00 +0000
+++ tests/org/tomdroid/sync/web/TestFetchingFromServer.java	2010-10-10 07:54:44 +0000
@@ -0,0 +1,119 @@
+/*
+ * 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.sync.web;
+
+import java.util.UUID;
+
+import org.tomdroid.Note;
+
+public class TestFetchingFromServer extends MockedSyncServerTestCase {
+
+	@SuppressWarnings("unused")
+	private static final String	TAG	= "TestFetchingFromServer";
+
+	public void testInitialization() throws Exception {
+		assertEquals("Max", getServer().firstName);
+		assertEquals("Mustermann", getServer().lastName);
+
+		assertTrue("should be in sync", getServer().isInSync(getLocalStorage()));
+
+		getSyncMethod().syncWith(getServer());
+		assertTrue("should be in sync", getServer().isInSync(getLocalStorage()));
+	}
+
+	public void testLoadingNewNoteFromServer() throws Exception {
+		Note remoteNote = getServer().testDataManipulator.createNewNote();
+		assertFalse("should be out of sync", getServer().isInSync(getLocalStorage()));
+
+		getSyncMethod().syncWith(getServer());
+		assertTrue("should be in sync again", getServer().isInSync(getLocalStorage()));
+
+		assertEquals("note ids should be the same", getServer().getNoteIds(), getLocalStorage()
+				.getNoteGuids());
+		Note localNote = getLocalStorage().getNote(remoteNote.getGuid());
+		assertEquals(remoteNote, localNote);
+	}
+
+	public void testChangingNoteTitleOnServer() throws Exception {
+		Note remoteNote = getServer().testDataManipulator.createNewNote();
+		getSyncMethod().syncWith(getServer());
+
+		remoteNote = getServer().testDataManipulator.setTitleOfNewestNote("Another Title");
+		assertEquals("server should still have one note", 1, getServer().storedNotes.size());
+		assertFalse("should be out of sync", getServer().isInSync(getLocalStorage()));
+
+		getSyncMethod().syncWith(getServer());
+		assertTrue("should be in sync again", getServer().isInSync(getLocalStorage()));
+
+		assertEquals(1, getLocalStorage().getNoteGuids().size());
+		assertEquals("note ids should be the same", getServer().getNoteIds(), getLocalStorage()
+				.getNoteGuids());
+
+		Note localNote = getLocalStorage().getNote(remoteNote.getGuid());
+		assertEquals(remoteNote, localNote);
+		assertEquals("local title should have changed", "Another Title", localNote.getTitle());
+	}
+
+	public void testChangingNoteContentOnServer() throws Exception {
+		Note remoteNote = getServer().testDataManipulator.createNewNote();
+		getSyncMethod().syncWith(getServer());
+
+		remoteNote = getServer().testDataManipulator
+				.setContentOfNewestNote("some other note content");
+		assertEquals("server should still have one note", 1, getServer().storedNotes.size());
+		assertFalse("should be out of sync", getServer().isInSync(getLocalStorage()));
+
+		getSyncMethod().syncWith(getServer());
+		assertTrue("should be in sync again", getServer().isInSync(getLocalStorage()));
+
+		assertEquals("note count", 1, getLocalStorage().getNoteGuids().size());
+		assertEquals("note ids should be the same", getServer().getNoteIds(), getLocalStorage()
+				.getNoteGuids());
+
+		Note localNote = getLocalStorage().getNote(remoteNote.getGuid());
+		assertEquals(remoteNote, localNote);
+		assertEquals("local content should have changed", "some other note content", localNote
+				.getXmlContent());
+	}
+
+	public void testDeletingNoteOnServer() throws Exception {
+		getServer().testDataManipulator.createNewNote();
+		UUID deletedNoteGuid = getServer().testDataManipulator.createNewNote().getGuid();
+		getServer().testDataManipulator.createNewNote();
+		getSyncMethod().syncWith(getServer());
+		assertEquals(3, getLocalStorage().getNoteGuids().size());
+
+		getServer().testDataManipulator.deleteNote(deletedNoteGuid);
+		assertEquals("server should have two notes", 2, getServer().storedNotes.size());
+		assertFalse("should be out of sync", getServer().isInSync(getLocalStorage()));
+
+		getSyncMethod().syncWith(getServer());
+		assertTrue("should be in sync again", getServer().isInSync(getLocalStorage()));
+
+		assertEquals(2, getLocalStorage().getNoteGuids().size());
+		assertEquals("note ids should be the same", getServer().getNoteIds(), getLocalStorage()
+				.getNoteGuids());
+
+		assertNull("guid should be in use", getLocalStorage().getNote(deletedNoteGuid));
+	}
+}

=== added file 'tests/org/tomdroid/sync/web/TestUpdatingTheServer.java'
--- tests/org/tomdroid/sync/web/TestUpdatingTheServer.java	1970-01-01 00:00:00 +0000
+++ tests/org/tomdroid/sync/web/TestUpdatingTheServer.java	2010-10-10 07:54:44 +0000
@@ -0,0 +1,126 @@
+/*
+ * 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.sync.web;
+
+import java.util.UUID;
+
+import org.tomdroid.Note;
+
+public class TestUpdatingTheServer extends MockedSyncServerTestCase {
+
+	public void testChangingNoteOnClient() throws Exception {
+		UUID guid = getServer().testDataManipulator.createNewNote().getGuid();
+		getSyncMethod().syncWith(getServer());
+
+		assertEquals("there should be no new/updated notes", 0, getLocalStorage()
+				.getNewAndUpdatedNotes().size());
+		Note localNote = modifyLocalNote(guid);
+		assertEquals("should have a changed note", 1, getLocalStorage().getNewAndUpdatedNotes()
+				.size());
+		assertEquals("should have the changed note", guid, getLocalStorage()
+				.getNewAndUpdatedNotes().get(0).getGuid());
+		assertEquals("note should contain the update", localNote.getXmlContent(), getLocalStorage()
+				.getNewAndUpdatedNotes().get(0).getXmlContent());
+		assertFalse("should be out of sync", getServer().isInSync(getLocalStorage()));
+
+		getSyncMethod().syncWith(getServer());
+		assertEquals("should have no changed notes anymore", 0, getLocalStorage()
+				.getNewAndUpdatedNotes().size());
+		assertTrue("should be in sync", getServer().isInSync(getLocalStorage()));
+
+		Note remoteNote = getServer().testDataManipulator.getNote(guid);
+		assertEquals("remote note should have correct timestamp", localNote.getLastChangeDate()
+				.format3339(false), remoteNote.getLastChangeDate().format3339(false));
+		assertEquals("remote note should have been updated", localNote.getXmlContent(), remoteNote
+				.getXmlContent());
+		assertEquals("locally stored note should bee the same as remote", getLocalStorage()
+				.getNote(guid).getXmlContent(), remoteNote.getXmlContent());
+
+	}
+
+	public void testChangingDifferentNotesOnClientAndServer() throws Exception {
+		UUID guid = getServer().testDataManipulator.createNewNote().getGuid();
+		getSyncMethod().syncWith(getServer());
+
+		modifyLocalNote(guid);
+		getServer().testDataManipulator.createNewNote();
+		getSyncMethod().syncWith(getServer());
+
+		assertEquals(2, getLocalStorage().getNoteGuids().size());
+		assertEquals(2, getServer().getNoteIds().size());
+		assertTrue("should be in sync", getServer().isInSync(getLocalStorage()));
+	}
+
+	public void testServerNotStoringLocalModificationWhileSyncing() throws Exception {
+		UUID guid = getServer().testDataManipulator.createNewNote().getGuid();
+		getSyncMethod().syncWith(getServer());
+
+		modifyLocalNote(guid);
+		getServer().lockStoring();
+		getSyncMethod().syncWith(getServer());
+		getServer().unlockStoring();
+		
+		assertEquals("should still have the changed note", 1, getLocalStorage()
+				.getNewAndUpdatedNotes().size());
+		assertFalse("should be out of sync", getServer().isInSync(getLocalStorage()));
+	}
+
+	public void testMergingLocalModificationWithModificationOnServer() throws Exception {
+		UUID guid = getServer().testDataManipulator.createNewNote().getGuid();
+		getSyncMethod().syncWith(getServer());
+
+		modifyLocalNote(guid);
+		getServer().testDataManipulator.setContentOfNewestNote("server modification");
+		getSyncMethod().syncWith(getServer());
+
+		assertEquals(1, getLocalStorage().getNoteGuids().size());
+		assertEquals(1, getServer().getNoteIds().size());
+
+		assertTrue("should be in sync", getServer().isInSync(getLocalStorage()));
+		assertEquals("content should be merged", "server modification --merged-- Note content. Appended text for our test note!", getLocalStorage().getNote(guid)
+				.getXmlContent());
+		assertEquals("content should be equal on client and server", getLocalStorage()
+				.getNote(guid).getXmlContent(), getServer().testDataManipulator.getNewestNote()
+				.getXmlContent());
+	}
+
+	
+	private Note modifyLocalNote(UUID guid) throws Exception {
+		Note note = getLocalStorage().getNote(guid);
+		long creationTime = note.getLastChangeDate().toMillis(false);
+		Thread.sleep(1100);
+		String newContent = note.getXmlContent() + " Appended text for our test note!";
+		note.changeXmlContent(newContent);
+
+		long modificationTime = note.getLastChangeDate().toMillis(false);
+		assertTrue("timestamp should have changed", creationTime < modificationTime);
+
+		getLocalStorage().insertNote(note);
+		note = getLocalStorage().getNote(guid);
+		assertEquals("timestamp should have been updated", modificationTime, note
+				.getLastChangeDate().toMillis(false));
+		assertEquals("local note should have been updated", newContent, note.getXmlContent());
+		assertFalse("locally stored note should be marked as 'out of sync with server'", note.isSynced());
+		return note;
+	}
+}