Merge lp:~karni/ubuntuone-android-files/basic-upload into lp:ubuntuone-android-files

[Michał Karnicki]

Upload fully functional, supporting uploads from MediaContentProvider, based on source Uri.

Application needs little tweaks to support different media -- currently upload button provides picture upload functionality.

[Chad Miller (cmiller)]

review: Approve

[Chad Miller (cmiller)]

226 + InputStream _in = null;

I don't like the leading underscore here.

I'm not certain (Java is not my forte), but if you leave a variable unassigned, the value will still be null, but the compiler will detect cases in which an unassigned value would be used. I don't know if that would be best here, but there are three initializations to null nearby where the other behavior from the compiler might be better.

327 +// Log.d(TAG, fileInfo.getName()

You might as well kill this comment.

355 - private static int TRANSFER_NOTIFICATION = 200;

Are these milliseconds?

403 + public void uploadFile(Uri uri, String volume, String parent) {

This deserves a logging statement.

454 + "Syncing...", System.currentTimeMillis());

We should be trying to localize as we go.

[lp:~karni/ubuntuone-android-files/basic-upload]

11. By Michał Karnicki on 2010-12-24

SyncDaemon cleanup, some i18n

=== modified file '.classpath'
--- .classpath	2010-12-10 17:40:16 +0000
+++ .classpath	2010-12-24 00:07:14 +0000
@@ -5,7 +5,7 @@
 	<classpathentry kind="lib" path="libs/oauth-consumer-20100527.jar"/>
 	<classpathentry kind="lib" path="libs/signpost-commonshttp4-1.2.jar"/>
 	<classpathentry kind="lib" path="libs/signpost-core-1.2.jar"/>
-	<classpathentry kind="lib" path="libs/storageprotocol-1.1.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="libs/storageprotocol-1.1.0-20101221.192202-1.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="lib" path="libs/protobuf-java-2.3.0.jar"/>

=== modified file 'res/layout/activity_list.xml'
--- res/layout/activity_list.xml	2010-12-10 17:40:16 +0000
+++ res/layout/activity_list.xml	2010-12-24 00:07:14 +0000
@@ -14,12 +14,11 @@
 	        android:visibility="gone" />
     	
 	    <ImageView style="@style/TitleBarSeparator"
-	    	android:id="@+id/btn_title_share_separator" />
+	    	android:id="@+id/btn_title_upload_separator" />
 	    
 	    <ImageButton style="@style/TitleBarAction"
-	        android:id="@+id/btn_title_share"
-	        android:src="@drawable/ic_title_share_default"
-	        android:onClick="onRefreshClick" />
+	        android:id="@+id/btn_title_upload"
+	        android:src="@drawable/ic_title_share_default" />
 	    
 	    <ImageView style="@style/TitleBarSeparator"
 	    	android:id="@+id/btn_title_search_separator" />

=== modified file 'res/values/service.xml'
--- res/values/service.xml	2010-11-25 18:05:31 +0000
+++ res/values/service.xml	2010-12-24 00:07:14 +0000
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="service_notification"></string>
+	<!-- non-translatable -->
+	<item type="id" name="connecting_notification_id" />
+	<item type="id" name="syncing_notification_id" />
+	<item type="id" name="downloading_notification_id" />
+	<item type="id" name="uploading_notification_id" />
+	
+	<!-- translatable -->
+	<string name="service_notification_title">Ubuntu One Service</string>
+	<string name="connecting_notification_ticker">Connecting...</string>
+	<string name="connecting_notification_subtitle">Connecting...</string>
+	<string name="authenticating_notification_subtitle">Authenticating...</string>
+	<string name="syncing_notification_ticker">Syncing...</string>
+	<string name="syncing_notification_title">Ubuntu One Syncing</string>
+	<string name="syncing_notification_subtitle">Syncing...</string>
+		
 </resources>

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2010-12-10 17:40:16 +0000
+++ res/values/strings.xml	2010-12-24 00:07:14 +0000
@@ -4,8 +4,8 @@
     <string name="title_text">Ubuntu One Files</string>
     
     <!-- Login screen -->
-    <string name="login_btn_text">Log in</string>
-    <string name="login_desc_text">This is the description</string>
+    <string name="login_btn_text">Launch the browser to log in</string>
+    <string name="login_desc_text">The application will now use the browser to securely log you in to your personal cloud storage.</string>
     
     <!-- Dashboard items -->
     <string name="btn_files">Files</string>

=== modified file 'src/com/ubuntuone/android/files/UbuntuOneFiles.java'
--- src/com/ubuntuone/android/files/UbuntuOneFiles.java	2010-12-21 16:16:54 +0000
+++ src/com/ubuntuone/android/files/UbuntuOneFiles.java	2010-12-24 00:07:14 +0000
@@ -196,11 +196,32 @@
 					
 		}
 		
-		public void onFileUploaded(long id) throws RemoteException {
-//			Toast.makeText(CustomListActivity.this, id + " uploaded",
-//					Toast.LENGTH_SHORT);
+		public void onFileUploaded(final String filename) throws RemoteException {
+			if (sForegroundActivity != null) {
+				sForegroundActivity.runOnUiThread(new Runnable() {
+					public void run() {
+						Toast.makeText(sForegroundActivity, filename + " uploaded",
+								Toast.LENGTH_SHORT).show();
+						if (sForegroundActivity instanceof CustomListActivity) {
+							((CustomListActivity)sForegroundActivity).refreshListAdapter();
+						}
+					}
+				});
+			}
 		}
 		
+		public void onRefresh() throws RemoteException {
+			if (sForegroundActivity != null) {
+				sForegroundActivity.runOnUiThread(new Runnable() {
+					public void run() {
+						if (sForegroundActivity instanceof CustomListActivity) {
+							((CustomListActivity)sForegroundActivity).refreshListAdapter();
+						}
+					}
+				});
+			}
+		}
+
 		public void onFileDownloaded(long id) throws RemoteException {
 //			Toast.makeText(CustomListActivity.this, id + " downloaded",
 //					Toast.LENGTH_SHORT);

=== modified file 'src/com/ubuntuone/android/files/service/ISyncClient.aidl'
--- src/com/ubuntuone/android/files/service/ISyncClient.aidl	2010-12-10 17:40:16 +0000
+++ src/com/ubuntuone/android/files/service/ISyncClient.aidl	2010-12-24 00:07:14 +0000
@@ -2,9 +2,10 @@
 
 interface ISyncClient {
 	void onFileDownloaded(in long id);
-	void onFileUploaded(in long id);
+	void onFileUploaded(in String filename);
 	void onFilePublished(in long id);
 	void onFileUnpublished(in long id);
+	void onRefresh();
 	void onServiceIsWorking();
 	void onServiceIsIdle();
 	void onServiceIsWorkingLock();

=== modified file 'src/com/ubuntuone/android/files/service/ISyncClientListener.java'
--- src/com/ubuntuone/android/files/service/ISyncClientListener.java	2010-12-21 16:16:54 +0000
+++ src/com/ubuntuone/android/files/service/ISyncClientListener.java	2010-12-24 00:07:14 +0000
@@ -42,8 +42,20 @@
 	
 	public void onClientSetupFailed(final Throwable t);
 	
+	public void onFileDownloaded(Long id);
+	
+	public void onFileDownloadFailed(final Throwable t);
+	
+	public void onFileUploading(final String filename);
+	
+	public void onFileUploaded(final String filename);
+	
+	public void onFileUploadFailed(final Throwable t);
+	
 	public void onClientSyncing();
 	
+	public void onClientSyncingProgress(final int progress);
+	
 	public void onClientSynced();
 	
 	public void onClientSyncFailed(final Throwable t);

=== modified file 'src/com/ubuntuone/android/files/service/ISyncDaemon.aidl'
--- src/com/ubuntuone/android/files/service/ISyncDaemon.aidl	2010-12-21 15:40:59 +0000
+++ src/com/ubuntuone/android/files/service/ISyncDaemon.aidl	2010-12-24 00:07:14 +0000
@@ -11,5 +11,5 @@
 	void unregisterCallback(in ISyncClient client);
 	
 	void downloadFile(in long id);
-	void uploadFile(in Uri uri, in String path);
+	void uploadFile(in Uri uri, in String volume, in String node);
 }

=== modified file 'src/com/ubuntuone/android/files/service/SyncClient.java'
--- src/com/ubuntuone/android/files/service/SyncClient.java	2010-12-21 16:16:54 +0000
+++ src/com/ubuntuone/android/files/service/SyncClient.java	2010-12-24 00:07:14 +0000
@@ -22,9 +22,13 @@
 
 package com.ubuntuone.android.files.service;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,6 +43,8 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
+import android.provider.MediaStore;
+import android.provider.MediaStore.MediaColumns;
 import android.util.Config;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
@@ -54,8 +60,13 @@
 import com.ubuntuone.android.files.provider.FilesContract.Volumes;
 import com.ubuntuone.android.files.util.OAuthUtilities;
 import com.ubuntuone.storageprotocol.Client;
+import com.ubuntuone.storageprotocol.HashUtils;
 import com.ubuntuone.storageprotocol.IConnector;
+import com.ubuntuone.storageprotocol.HashUtils.HashInfo;
+import com.ubuntuone.storageprotocol.StorageProtocol.AccountInfo;
 import com.ubuntuone.storageprotocol.StorageProtocol.NodeState;
+import com.ubuntuone.storageprotocol.StorageProtocol.VolumeDeleted;
+import com.ubuntuone.storageprotocol.StorageProtocol.VolumeNewGeneration;
 import com.ubuntuone.storageprotocol.StorageProtocol.FileInfo.FileType;
 import com.ubuntuone.storageprotocol.StorageProtocol.Volumes.VolumeType;
 import com.ubuntuone.storageprotocol.request.GetContent;
@@ -68,7 +79,9 @@
 import com.ubuntuone.storageprotocol.request.ListVolumes.Root;
 import com.ubuntuone.storageprotocol.request.ListVolumes.UDF;
 import com.ubuntuone.storageprotocol.request.ListVolumes.Volume;
+import com.ubuntuone.storageprotocol.request.MakeObject.MakeFile;
 import com.ubuntuone.storageprotocol.request.Query.QueryItem;
+import com.ubuntuone.storageprotocol.request.Request.ClientCallback;
 
 public class SyncClient extends Client {
 	private static final String TAG = SyncClient.class.getSimpleName();
@@ -103,6 +116,7 @@
 		this.mService = service;
 		this.mContext = UbuntuOneFiles.getInstance().getApplicationContext();
 		this.mResolver = UbuntuOneFiles.getInstance().getContentResolver();
+		setVolumeNewGenerationCallback(volumeNewGenerationCallback);
 	}
 
 	private boolean mIsConnecting = false;
@@ -230,8 +244,57 @@
 			}
 		});
 	}
+	
+	@Override
+	public void setAccountInfoCallback(
+			ClientCallback<AccountInfo> accountInfoCallback) {
+		// TODO Auto-generated method stub
+		super.setAccountInfoCallback(accountInfoCallback);
+	}
+
+	@Override
+	public void setFreeSpaceCallback(
+			ClientCallback<Map<Integer, Object>> freeSpaceCallback) {
+		// TODO Auto-generated method stub
+		super.setFreeSpaceCallback(freeSpaceCallback);
+	}
+
+	@Override
+	public void setVolumeCreatedCallback(
+			ClientCallback<com.ubuntuone.storageprotocol.StorageProtocol.Volumes> volumeCreatedCallback) {
+		// TODO Auto-generated method stub
+		super.setVolumeCreatedCallback(volumeCreatedCallback);
+	}
+
+	@Override
+	public void setVolumeDeletedCallback(
+			ClientCallback<VolumeDeleted> volumeDeletedCallback) {
+		// TODO Auto-generated method stub
+		super.setVolumeDeletedCallback(volumeDeletedCallback);
+	}
+
+	@Override
+	public void setVolumeNewGenerationCallback(
+			ClientCallback<VolumeNewGeneration> volumeNewGenerationCallback) {
+		super.setVolumeNewGenerationCallback(volumeNewGenerationCallback);
+		
+	}
+	
+	private ClientCallback<VolumeNewGeneration> volumeNewGenerationCallback
+			= new ClientCallback<VolumeNewGeneration>() {
+
+				public void callback(VolumeNewGeneration newGeneration) {
+					Log.d(TAG, "volume " 
+							+ newGeneration.getVolume().toStringUtf8()
+							+ " at generation " + newGeneration.getGeneration());
+				}
+		
+			};
+
+	private AtomicInteger volumesSyncing = new AtomicInteger(0);
 
 	public void getVolumes() {
+		mService.onClientSyncing();
 		final Deferred d = listVolumes().getDeferred();
 		d.addCallbacks(new Callback<ListVolumes>() {
 			public Object callback(ListVolumes o) throws Exception {
@@ -287,6 +350,51 @@
 		});
 	}
 	
+	/**
+	 * The client has been notified about content change,
+	 * verify and sync if necessary.
+	 */
+	@Override
+	public void notifyNodeState(NodeState message) {
+		super.notifyNodeState(message);
+		Log.d(TAG, "notifyNodeState " + message);
+//		getVolumes();
+		
+//		final NodeState nodeState = message;
+//		final String volume = nodeState.getShare().toStringUtf8();
+//		final String node = nodeState.getNode().toStringUtf8();
+//		final String hash = nodeState.getHash().toStringUtf8();
+//		String currentHash = null;
+//		String type = null;
+//		if (LOGI) Log.i(TAG, "received nodeState for " + node);
+//		
+//		Cursor c = FilesUtilities.getFile(mResolver, volume, node);
+//		if (c.moveToNext()) {
+//			currentHash = c.getString(c.getColumnIndex(Files.HASH));
+//			if (currentHash == null)
+//				currentHash = "";
+//			type = c.getString(c.getColumnIndex(Files.TYPE));
+//		}
+//		c.close();
+//		
+//		if (FileType.DIRECTORY.toString().equals(type)) {
+//			// update cached directory, if necessary
+//			if (currentHash.equals(hash) == false) {
+//				mService.
+//				if (nodeStateNotifications.contains(node) == false) {
+//					nodeStateNotifications.add(node);
+//					service.updateDirContents(node);
+//				}
+//			}
+//		} else {
+//			if (currentHash.equals(hash) == false) {
+//				if (LOGI) Log.v(TAG, "download node " + node);
+//				//service.downloadFile(cfData.getLong(CloudFiles._ID));
+//				//updateDirContents(node);
+//			}
+//		}
+	}
+	
 	// ========== update volume entry ==========
 
 	private void updateRoot(final Root root)
@@ -396,14 +504,13 @@
 			}
 			if (id != null) {
 				// Remove meta.
-				mResolver.delete(Files.CONTENT_URI, Files._ID + "=?",
-						new String[]{id});
+				mResolver.delete(Files.buildFileUri(id), null, null);
 			}
 			return;
 		}
 		
 		// If this is an unnamed node, it's a volume root - give it a name.
-		if (name == null) {// || name.length() == 0) {
+		if (name == null || name.length() == 0) {
 			Volume v = sVolumes.get(volume);
 			if (v instanceof Root) {
 				parent = VolumeType.ROOT.toString();
@@ -418,8 +525,7 @@
 				name = ((Share)v).getName();
 			}
 		}
-		// Escape any left slashes.
-		//name.replace("/", "//");
+		
 		
 		Cursor c = FilesUtilities.getFile(mResolver, volume, node);
 		final ContentValues values = Files.getContentValues(
@@ -478,7 +584,7 @@
 			parentC.close();
 			values.remove(Files.DATA);
 			values.put(Files.DATA, parentPath + "/" + name);
-			Log.d(TAG, ">>> " + values.getAsString(Files.DATA));
+			//Log.d(TAG, ">>> " + values.getAsString(Files.DATA));
 			
 			// Insert file entry.
 			mResolver.insert(Files.CONTENT_URI, values);
@@ -576,12 +682,12 @@
 		});
 		d.addCallbacks(new Callback<Object>() {
 			public Object callback(Object o) throws Exception {
-				mService.onDownloadedFile(id);
+				mService.onFileDownloaded(id);
 				return null;
 			}
 		}, new Callback<Failure>() {
 			public Object callback(Failure f) throws Exception {
-				mService.onDownloadFileFailed(f.getCause());
+				mService.onFileDownloadFailed(f.getCause());
 				return null;
 			}
 		});
@@ -595,10 +701,95 @@
 	
 	// ========== end of download file ==========
 	
+	// ========== upload file ==========
+	
+	public void uploadFile(final Uri uri, final String volume, final String parent) {
+		if (LOGD) Log.d(TAG, "uploadFile");
+		if (LOGV) Log.v(TAG, uri + " under " + parent);		
+		Context ctx = UbuntuOneFiles.getInstance();
+		InputStream inputStream = null;
+		try {
+			inputStream = ctx.getContentResolver().openInputStream(uri);
+		} catch (FileNotFoundException e) {
+			mService.onFileUploadFailed(e.getCause());
+			return;
+		}
+		final InputStream fInputStream = inputStream;
+		
+		/*
+		 * TODO
+		 * - possibly speed this up
+		 * - add custom file upload
+		 */
+		Uri fileSource = null;
+		String uriStr = uri.toString();
+		if (uriStr.startsWith(
+				MediaStore.Images.Media.EXTERNAL_CONTENT_URI.toString()))
+			fileSource = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+		else if (uriStr.startsWith(
+				MediaStore.Video.Media.EXTERNAL_CONTENT_URI.toString()))
+			fileSource = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+		else if (uriStr.startsWith(
+				MediaStore.Audio.Media.EXTERNAL_CONTENT_URI.toString()))
+			fileSource = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+		else fileSource = uri;
+		
+		String[] projection = new String[] { MediaColumns._ID,
+				MediaColumns.DISPLAY_NAME, MediaColumns.SIZE };
+		
+		Cursor c = ctx.getContentResolver()
+				.query(fileSource,
+						projection,
+						MediaColumns._ID + " = ?",
+						new String[] { uri.getLastPathSegment() },
+						null);
+		
+		String _filename = null;
+		//long size = -1;
+		if (c.moveToFirst()) {
+			_filename = c.getString(c.getColumnIndex(MediaColumns.DISPLAY_NAME));
+			//size = c.getLong(c.getColumnIndex(MediaColumns.SIZE));
+		}
+		c.close();
+		if (_filename == null)
+			mService.onFileUploadFailed(new Throwable(
+					"could not get filename for upload"));
+		
+		if (LOGV) Log.v(TAG, "from media store: " + _filename);
+		final String filename = _filename;
+		
+		final Deferred d = makeFile(volume, parent, _filename).getDeferred();
+		d.addCallback(new Callback<MakeFile>() {
+			public Object callback(MakeFile req) throws Exception {
+				if (LOGV) Log.v(TAG, "new file id: " + req.getNewId());
+		        ByteArrayOutputStream os = new ByteArrayOutputStream();
+		        HashInfo hashInfo = HashUtils.getHashInfo(fInputStream, os);
+		        InputStream deflated = new ByteArrayInputStream(os.toByteArray());
+				return putContent(volume, req.getNewId(), "",
+						hashInfo.hash, hashInfo.crc32, hashInfo.size,
+						hashInfo.deflatedSize, deflated).getDeferred();
+			}
+		});
+		d.addCallbacks(new Callback<Object>() {
+			public Object callback(Object o) throws Exception {
+				mService.onFileUploaded(filename);
+				return null;
+			}
+		}, new Callback<Failure>() {
+			public Object callback(Failure f) throws Exception {
+				mService.onFileUploadFailed(f.getCause());
+				return null;
+			}
+		});
+	}
+	
+	// ========== end of upload file ==========
+	
 	// ========== sync volume ==========
 
 	private void syncVolume(final Volume volume, final Boolean fromScratch) {
 		final String volumeId = volume.getVolumeId();
+		volumesSyncing.incrementAndGet();
 		Log.d(TAG, "syncVolume(volume = " + volumeId 
 				+ ", fromScratch = " + fromScratch + ")");
 		// retrieve known generation, if any
@@ -624,17 +815,25 @@
 		
 		d.addCallback(new Callback<GetDelta>() {
 			public Object callback(final GetDelta getDelta) throws Exception {
-				for (FileInfoDelta fileInfo : getDelta.getResponse()) {
-					Log.d(TAG, fileInfo.getName()
+				final List<FileInfoDelta> fileInfoList = getDelta.getResponse();
+				final int size = fileInfoList.size();
+				int progress = 0;
+				for (FileInfoDelta fileInfo : fileInfoList) {
+					progress++;
+					if (LOGV) Log.d(TAG, fileInfo.getName()
 							+ ", parent_id: " + fileInfo.getParentId().toStringUtf8()
 							+ ", node_id: " + fileInfo.getNodeId().toStringUtf8() 
 							+ ", is_live: " + fileInfo.isLive()
 							+ ", size: " + fileInfo.getSize());
+					mService.onClientSyncingProgress(100*progress/size);
 					updateFile(fileInfo);
 				}
 				if (LOGD) Log.d(TAG, "End generation: " + getDelta.getEndGeneration()
 						+ ", free_bytes: " + getDelta.getFreeBytes()
 						+ ", full delta: " + getDelta.isFull());
+				int vs = volumesSyncing.decrementAndGet();
+				if (vs == 0)
+					mService.onClientSynced();
 				return getDelta;
 			}
 		});

=== modified file 'src/com/ubuntuone/android/files/service/SyncDaemon.java'
--- src/com/ubuntuone/android/files/service/SyncDaemon.java	2010-12-21 16:16:54 +0000
+++ src/com/ubuntuone/android/files/service/SyncDaemon.java	2010-12-24 00:07:14 +0000
@@ -27,223 +27,320 @@
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Intent;
-import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.IBinder;
-import android.os.Message;
 import android.os.RemoteException;
 import android.util.Config;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.ubuntuone.android.files.Preferences;
 import com.ubuntuone.android.files.R;
 import com.ubuntuone.android.files.UbuntuOneFiles;
 import com.ubuntuone.android.files.ui.DashboardActivity;
 import com.ubuntuone.storageprotocol.IConnector;
 import com.ubuntuone.storageprotocol.oio.OIOConnector;
 
-@SuppressWarnings("unused")
+/*
+ * TODO:
+ * - extend mClientCallback interface to provide more feedback from the service,
+ *   majority of TODOs in this file should be simple calls to better callback
+ *   interface.
+ */
 public final class SyncDaemon extends Service implements ISyncClientListener {
 	
 	private static final String TAG = SyncDaemon.class.getSimpleName();
 	
-	private static boolean LOGV = Config.DEBUG || Log.isLoggable(TAG, Log.VERBOSE);
 	private static boolean LOGD = Config.DEBUG || Log.isLoggable(TAG, Log.DEBUG);
 	private static boolean LOGI = Config.DEBUG || Log.isLoggable(TAG, Log.INFO);
-	private static boolean LOGW = Config.DEBUG || Log.isLoggable(TAG, Log.WARN);
+	private static boolean LOGW = Config.DEBUG || Log.isLoggable(TAG, Log.ERROR);
 	private static boolean LOGE = Config.DEBUG || Log.isLoggable(TAG, Log.ERROR);
 	
-	// Ubuntu One cloud storage client
+	/**
+	 * Ubuntu One storage protocol client.
+	 */
 	private SyncClient mClient;
 	
-	// Activity callback interface
+	/**
+	 * OIO connector used by {@link SyncClient}
+	 */
+	private IConnector mConnector;
+	
+	/**
+	 * Callback interface to running {@link UbuntuOneFiles} instance.
+	 */
 	private ISyncClient mClientCallback;
 	
-	private IConnector mConnector;
 	
 	public static final String ACTION_START = 
 			"com.ubuntuone.android.files.service.ACTION_START";
 	public static final String ACTION_STOP =
 			"com.ubuntuone.android.files.service.ACTION_STOP";
 	
-	private ConnectivityManager mCM;
+	/**
+	 * A {@link PendingIntent} used after tap on general notifications.
+	 */
+	private PendingIntent mDashboardIntent;
+	
+	/**
+	 * {@link NotificationManager} used for connecting, syncing, uploading and
+	 * downloading notifications.
+	 */
 	private NotificationManager mNM;
-	private Notification mConnectionNotification;
-	private static int CONNECTION_NOTIFICATION = 100;
-	private Notification mTransferNotification;
-	private static int TRANSFER_NOTIFICATION = 200;
+	
+	private Notification mConnectingNotification;
+	private Notification mSyncingNotification;
+	
+	/*
+	 * Notification ID's used to track above notifications.
+	 */
+	private static int CONNECTING_NOTIFICATION_ID =
+		R.id.connecting_notification_id;
+	private static int SYNCING_NOTIFICATION_ID =
+		R.id.syncing_notification_id;
 	
 	@Override
 	public void onCreate() {
 		super.onCreate();
+		if (LOGI) Log.i(TAG, "starting Ubuntu One service");
+		
+		// Initialize notofication manager.
 		mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
-		mCM = (ConnectivityManager)getSystemService(CONNECTIVITY_SERVICE);
 		
+		// Setup U1 storage protocol client.
 		mConnector = new OIOConnector(true);
 		mClient = new SyncClient(this, mConnector);
 		
-//		IntentFilter intentFilter = new IntentFilter();
-//		intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
-//		intentFilter.addAction(ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED);
-//		registerReceiver(mNetworkObserver, intentFilter);
+		// Setup intent fired on general notification tap.
+		mDashboardIntent = PendingIntent.getActivity(this, 0,
+				new Intent(this, DashboardActivity.class), 0);
 		
+		// Connect.
+		// TODO U1F: Connection settings.
 		connect();
 	}
-
-	public SyncClient getSyncClient() {
-		return mClient;
-	}
 	
 	public boolean isWorking() {
-		return (mClient != null) ? mClient.mTasksRunning.get() > 0 : false;
+		return mClient.mTasksRunning.get() > 0;
 	}
 	
 	public void connect() {
-		if (mConnectionNotification == null) {
-			mConnectionNotification = new Notification(R.drawable.launcher,
-					"Connecting...", System.currentTimeMillis());
-			PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
-					new Intent(this, DashboardActivity.class), 0);
-			mConnectionNotification.setLatestEventInfo(this,
-					"Ubuntu One Service", "Connecting...", contentIntent);
+		if (mConnectingNotification == null) {
+			mConnectingNotification = new Notification(
+					R.drawable.launcher,
+					getText(R.string.connecting_notification_ticker),
+					System.currentTimeMillis());
 		}
+		mConnectingNotification.setLatestEventInfo(this,
+				getText(R.string.service_notification_title),
+				getText(R.string.connecting_notification_subtitle),
+				mDashboardIntent);
 		mClient.connectClient();
 	}
 	
-	private boolean maybeReconnect() {
-		if (mConnector.isConnected() == false) {
-			mClient.connectClient();
-			return true;
-		}
-		return false;
-	}
-	
 	public boolean isConnected() {
 		return mClient.isConnected();
 	}
 	
-	public void authenticte() {
-		PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
-				new Intent(this, DashboardActivity.class), 0);
-		mConnectionNotification.setLatestEventInfo(this,
-				"Ubuntu One Service", "Authenticating...", contentIntent);
-		mNM.notify(CONNECTION_NOTIFICATION, mConnectionNotification);
-		mClient.authenticateClient();
-	}
-	
-	public void setup() {
-		mClient.setupClient();
-	}
-	
-	public void getVolumes() {
-		mClient.getVolumes();
-	}
-	
-	public void disconect() {
-		mClient.disconnectClient();
-	}
-	
-	private void downloadFile(Long id) {
-		if (maybeReconnect())
-			return;
-		mClient.downloadFile(id);
-	}
-	
-	public void onDownloadedFile(long id) {
-		if (LOGD) Log.d(TAG, "onDownloadedFile");
-		try {
-			mClientCallback.onFileDownloaded(id);
-		} catch (RemoteException e) {
-			if (LOGE) Log.e(TAG, "", e);
-		}
-	}
-	
-	public void onDownloadFileFailed(Throwable eek) {
-		if (LOGD) Log.d(TAG, "onDownloadFileFailed");
-		if (LOGE) Log.e(TAG, "", eek);
-	}
-	
-	public void uploadFile(Uri uri, String path) {
-		
-	}
-	
 	public void onClientConnecting() {
-		Log.d(TAG, "onClientConnecting");
-		mNM.notify(CONNECTION_NOTIFICATION, mConnectionNotification);
+		if (LOGD) Log.d(TAG, "onClientConnecting");
+		mNM.notify(CONNECTING_NOTIFICATION_ID, mConnectingNotification);
 	}
 
 	public void onClientConnected() {
-		Log.d(TAG, "onClientConnected");
+		if (LOGD) Log.d(TAG, "onClientConnected");
+		if (LOGI) Log.i(TAG, "Ubuntu One service has connected");
 		authenticte();		
 	}
 	
 	public void onClientConnectFailed(final Throwable t) {
-		mNM.cancel(CONNECTION_NOTIFICATION);
-		Log.d(TAG, "onClientConnectFailed");
+		Log.d(TAG, "onClientConnectFailed", t);
+		mNM.cancel(CONNECTING_NOTIFICATION_ID);
+		// TODO Notify UbuntuOneFiles about failed connection attempt.
+	}
+	
+	public void authenticte() {
+		mConnectingNotification.setLatestEventInfo(this,
+				getText(R.string.service_notification_title),
+				getText(R.string.authenticating_notification_subtitle),
+				mDashboardIntent);
+		mClient.authenticateClient();
+	}
+	
+	public boolean isAuthenticated() {
+		return mClient.isAuthenticated();
 	}
 	
 	public void onClientAuthenticating() {
-		Log.d(TAG, "onClientAuthenticating");		
+		if (LOGD) Log.d(TAG, "onClientAuthenticating");
+		// Show notification with updated subtitle.
+		mNM.notify(CONNECTING_NOTIFICATION_ID, mConnectingNotification);
 	}
 	
 	public void onClientAuthenticated() {
-		Log.d(TAG, "onClientAuthenticated");
-		mNM.cancel(CONNECTION_NOTIFICATION);
+		if (LOGD) Log.d(TAG, "onClientAuthenticated");
+		if (LOGI) Log.i(TAG, "Ubuntu One service has authenticated");
+		mNM.cancel(CONNECTING_NOTIFICATION_ID);
 		setup();
 	}
 	
 	private int mAuthsFailed = 0;
 	
 	public void onClientAuthenticateFailed(final Throwable t) {
-		Log.d(TAG, "onClientAuthenticatedFailed");
+		if (LOGD) Log.d(TAG, "onClientAuthenticatedFailed");
+		if (LOGW) Log.w(TAG, "Ubuntu One service failed to authenticate", t);
 		mAuthsFailed++;
 		if (UbuntuOneFiles.sForegroundActivity != null) {
 			Toast.makeText(UbuntuOneFiles.sForegroundActivity,
 					"Authentication failed.\nRetrying...", Toast.LENGTH_SHORT)
 					.show();
-			Message m;
-		}
-		// TODO Notify any app instances about the failure		
-	}
-	
-	public void onClientDisconnecting() {
-		Log.d(TAG, "onClientDisconnecting");		
-	}
-	
-	public void onClientDisconnected() {
-		Log.d(TAG, "onClientDisconnected");
-	}
-	
-	public void onClientDisconnectFailed(final Throwable t) {
-		Log.d(TAG, "onClientDisconnectFailed");
-		// TODO Notify any app instances about the failure
+		}
+		if (mAuthsFailed > 3) {
+			if (LOGE) Log.e(TAG, "Ubuntu One service auth failed, " +
+					"requesting re-auth");
+			Preferences.updateAccessToken(null, null);
+			disconect();
+			// TODO Notify UbuntuOneFiles instance about need to re-auth.
+		}
+		authenticte();
+	}
+	
+	public void setup() {
+		mClient.setupClient();
 	}
 	
 	public void onClientSetup() {
-		Log.d(TAG, "onClientSetup");		
+		if (LOGD) Log.d(TAG, "onClientSetup");
 	}
 
 	public void onClientSetupDone() {
-		Log.d(TAG, "onClientSetupDone");
-		getVolumes();
+		if (LOGD) Log.d(TAG, "onClientSetupDone");
+		sync();
 	}
 
 	public void onClientSetupFailed(Throwable t) {
-		Log.d(TAG, "onClientSetupFailed");
-		// TODO Notify any app instances about the failure
-	}
-
+		if (LOGD) Log.d(TAG, "onClientSetupFailed");
+		if (LOGE) Log.e(TAG, "Ubuntu One service failed to setup", t);
+		disconect();
+		// TODO Notify UbuntuOneFiles instance about the setup issue.
+	}
+	
+	public void sync() {
+		mClient.getVolumes();
+	}
+	
 	public void onClientSyncing() {
-		Log.d(TAG, "onClientSyncing");		
+		if (LOGD) Log.d(TAG, "onClientSyncing");
+		if (LOGI) Log.i(TAG, "Ubuntu One service is synchronizing");
+		if (mSyncingNotification == null) {
+			mSyncingNotification = new Notification(
+					R.drawable.launcher,
+					getText(R.string.syncing_notification_ticker),
+					System.currentTimeMillis());
+		}
+		mSyncingNotification.setLatestEventInfo(this,
+				getText(R.string.service_notification_title),
+				getText(R.string.syncing_notification_subtitle),
+				mDashboardIntent);
+		mNM.notify(SYNCING_NOTIFICATION_ID, mSyncingNotification);
 	}
 	
+	public void onClientSyncingProgress(int progress) {
+		String status = String.format("Progress (per volume): %d %%", progress);
+		// mSyncingNotification is not null, onClientSyncing has been called
+		mSyncingNotification.setLatestEventInfo(this,
+				getText(R.string.syncing_notification_title),
+				status,
+				mDashboardIntent);
+		mNM.notify(SYNCING_NOTIFICATION_ID, mSyncingNotification);
+	}
+
 	public void onClientSynced() {
-		Log.d(TAG, "onClientSynced");		
+		if (LOGD) Log.d(TAG, "onClientSynced");
+		if (LOGI) Log.i(TAG, "Ubuntu One service has synchronized");
+		mNM.cancel(SYNCING_NOTIFICATION_ID);
+		try {
+			// FIXME Adjust mCallbackInterface, as written in top TODO.
+			mClientCallback.onRefresh();
+		} catch (RemoteException e) {
+			if (LOGE) Log.e(TAG, "", e);
+		}
 	}
 
 	public void onClientSyncFailed(final Throwable t) {
-		Log.d(TAG, "onClientSyncFailed");
-		// TODO Notify any app instances about the failure
+		if (LOGD) Log.d(TAG, "onClientSyncFailed");
+		if (LOGE) Log.e(TAG, "Ubuntu One service failed to synchronize", t);
+		mNM.cancel(SYNCING_NOTIFICATION_ID);
+		// TODO Notify any app instances about the sync failure.
+	}
+	
+	public void disconect() {
+		mClient.disconnectClient();
+	}
+	
+	public void onClientDisconnecting() {
+		if (LOGD) Log.d(TAG, "onClientDisconnecting");
+		// XXX Show notification about disconnection?
+	}
+	
+	public void onClientDisconnected() {
+		if (LOGD) Log.d(TAG, "onClientDisconnected");
+		if (LOGI) Log.i(TAG, "Ubuntu One service has disconnected");
+	}
+	
+	public void onClientDisconnectFailed(final Throwable t) {
+		if (LOGD) Log.d(TAG, "onClientDisconnectFailed");
+		if (LOGE) Log.e(TAG, "Ubuntu One service failed to disconnect", t);
+		// TODO Notify app instance about the disconnection failure.
+	}
+	
+	private void downloadFile(Long id) {
+		// XXX Should we limit the loggin overhead? This is kinda verbose.
+		if (LOGI) Log.i(TAG, "downloadFile, id=" + id);
+		mClient.downloadFile(id);
+	}
+	
+	public void onFileDownloaded(Long id) {
+		if (LOGD) Log.d(TAG, "onDownloadedFile");
+		if (LOGI) Log.i(TAG, "downloaded file, id=" + id);
+		try {
+			mClientCallback.onFileDownloaded(id);
+		} catch (RemoteException e) {
+			if (LOGE) Log.e(TAG, "", e);
+		}
+	}
+
+	public void onFileDownloadFailed(Throwable t) {
+		if (LOGD) Log.d(TAG, "onFileDownloadFailed");
+		if (LOGE) Log.e(TAG, "Ubuntu One service failed to download file", t);
+		// TODO Notify app instance about file download failure.
+	}
+	
+	public void uploadFile(Uri uri, String volume, String parent) {
+		if (LOGD) Log.d(TAG, "uploadFile");
+		if (LOGI) Log.i(TAG, "uploadFile " + uri.toString());
+		mClient.uploadFile(uri, volume, parent);
+	}
+	
+	public void onFileUploading(String filename) {
+		if (LOGD) Log.d(TAG, "onFileUploading");
+		if (LOGI) Log.i(TAG, "uploading " + filename);
+	}
+
+	public void onFileUploaded(String filename) {
+		if (LOGD) Log.d(TAG, "onFileUploaded");
+		if (LOGI) Log.i(TAG, "uploaded " + filename);
+		try {
+			mClientCallback.onFileUploaded(filename);
+		} catch (RemoteException e) {
+			if (LOGE) Log.e(TAG, "", e);
+		}
+	}
+
+	public void onFileUploadFailed(Throwable t) {
+		if (LOGD) Log.d(TAG, "onFileUploadFailed");
+		if (LOGE) Log.e(TAG, "failed to upload file", t);
+		// TODO Notify app instance about file upload failure.
 	}
 	
 	@Override
@@ -271,7 +368,6 @@
 		
 		public void registerCallback(ISyncClient client) throws RemoteException {
 			SyncDaemon.this.mClientCallback = client;
-			maybeReconnect();
 			if (mClient.mTasksRunning.get() > 0)
 				mClientCallback.onServiceIsWorking();		
 		}
@@ -286,8 +382,8 @@
 			SyncDaemon.this.downloadFile(id);
 		}
 		
-		public void uploadFile(Uri uri, String node) throws RemoteException {
-			SyncDaemon.this.uploadFile(uri, node);
+		public void uploadFile(Uri uri, String volume, String parent) throws RemoteException {
+			SyncDaemon.this.uploadFile(uri, volume, parent);
 		}
 	};
 

=== modified file 'src/com/ubuntuone/android/files/ui/CustomListActivity.java'
--- src/com/ubuntuone/android/files/ui/CustomListActivity.java	2010-12-21 16:16:54 +0000
+++ src/com/ubuntuone/android/files/ui/CustomListActivity.java	2010-12-24 00:07:14 +0000
@@ -35,6 +35,7 @@
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
@@ -49,6 +50,7 @@
 import com.ubuntuone.android.files.provider.FilesContract.Files;
 import com.ubuntuone.android.files.provider.FilesContract.FilesStatus;
 import com.ubuntuone.android.files.util.CustomListActivityAdapter;
+import com.ubuntuone.storageprotocol.StorageProtocol.Volumes.VolumeType;
 
 public abstract class CustomListActivity extends ListActivity {
 	private static final String TAG = CustomListActivity.class.getSimpleName();
@@ -71,6 +73,21 @@
 		TextView titleText = (TextView)findViewById(R.id.title_text);
 		titleText.setText(getActionBarTitle());
 		registerForContextMenu(getListView());
+		
+		ImageButton upload = (ImageButton) findViewById(R.id.btn_title_upload);
+		upload.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				// FIXME just hide the upload button where appropriate
+				if (mAdapter.getPathTool().isAtRoot() && 
+						!VolumeType.ROOT.equals(
+								mAdapter.getPathTool().getType())) {
+					Toast.makeText(CustomListActivity.this, 
+							"Can't upload here", Toast.LENGTH_SHORT).show();
+				} else {
+					onUploadImage();
+				}
+			}
+		});
 	}
 	
 	@Override
@@ -102,12 +119,72 @@
 		});
 	}
 	
+	public void onUploadImage() {
+		Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+		intent.setType("image/*");
+		
+		Intent chooser = Intent.createChooser(intent, "Pick image with");
+		startActivityForResult(chooser, REQUEST_GET_FILE);
+	}
+	
+	public void onUploadVideo() {
+		Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+		intent.setType("video/*");
+		
+		Intent chooser = Intent.createChooser(intent, "Pick video with");
+		startActivityForResult(chooser, REQUEST_GET_FILE);
+	}
+	
+	public void onUploadAudio() {
+		Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+		intent.setType("audio/*");
+		
+		Intent chooser = Intent.createChooser(intent, "Pick audio with");
+		startActivityForResult(chooser, REQUEST_GET_FILE);
+	}
+	
+	private static final int REQUEST_GET_FILE = 1;
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		if (LOGD)
+			Log.d(TAG, "onActivityResult");
+		super.onActivityResult(requestCode, resultCode, data);
+
+		switch (requestCode) {
+		case REQUEST_GET_FILE:
+			if (resultCode == RESULT_OK && data != null) {
+				final Uri uri = data.getData();
+				final String volume = mAdapter.getPathTool().getVolume();
+				final String node = mAdapter.getPathTool().getCurrentNode();
+				Log.d(TAG, "uploading " + uri + " under " + volume + " - " + node);
+				new Thread(new Runnable() {
+					public void run() {
+						try {
+							UbuntuOneFiles.getService()
+								.uploadFile(uri, volume, node);
+						} catch (RemoteException e) {
+							e.printStackTrace();
+						}
+					}
+				}).start();		
+			} else {
+				if (LOGE) Log.e(TAG, "no file selected");
+				Toast.makeText(this,
+						"No file selected", Toast.LENGTH_SHORT).show();
+			}			
+			break;	
+		default:
+			break;
+		}
+	}
+	
 	protected abstract CharSequence getActionBarTitle();
 	
 	protected void setUploadButtonVisible(boolean visible) {
-		ImageButton upload = (ImageButton) findViewById(R.id.btn_title_share);
+		ImageButton upload = (ImageButton) findViewById(R.id.btn_title_upload);
 		upload.setVisibility(visible ? View.VISIBLE : View.GONE);
-		ImageView separator = (ImageView)findViewById(R.id.btn_title_share_separator);
+		ImageView separator = (ImageView)findViewById(R.id.btn_title_upload_separator);
 		separator.setVisibility(visible ? View.VISIBLE : View.GONE);
 	}
 	
@@ -177,7 +254,6 @@
 		final String type = cfData.getString(Files.MIME);
 		final String data = cfData.getString(Files.DATA);
 		
-		Log.d(TAG, ">>> status: " + status);
 		// FIXME use FileStatus. fields instead of those terrible ints..
 		switch (status) {
 		case 1: // FileStatus.READY
@@ -186,7 +262,6 @@
 					Intent.FLAG_GRANT_READ_URI_PERMISSION |
 					Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
 			intent.setDataAndType(Uri.fromFile(new File(data)), type);
-			Log.d(TAG, ">>>>> type = " + type);
 			Intent chooser = Intent.createChooser(intent, "Open with");
 			startActivityForResult(chooser, 0);
 			break;

=== modified file 'src/com/ubuntuone/android/files/ui/SharesActivity.java'
--- src/com/ubuntuone/android/files/ui/SharesActivity.java	2010-12-21 16:16:54 +0000
+++ src/com/ubuntuone/android/files/ui/SharesActivity.java	2010-12-24 00:07:14 +0000
@@ -33,9 +33,8 @@
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setUploadButtonVisible(false);
 		// at top level, upload button invisible
-		setUploadButtonVisible(false);
+		setUploadButtonVisible(true);
 		setListAdapter(CustomListActivityAdapter.buildAdapter(
 				this, VolumeType.SHARE));
 	}

=== modified file 'src/com/ubuntuone/android/files/ui/UdfsActivity.java'
--- src/com/ubuntuone/android/files/ui/UdfsActivity.java	2010-12-21 16:16:54 +0000
+++ src/com/ubuntuone/android/files/ui/UdfsActivity.java	2010-12-24 00:07:14 +0000
@@ -34,7 +34,7 @@
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		// at top level, upload button invisible
-		setUploadButtonVisible(false);
+		setUploadButtonVisible(true);
 		setListAdapter(CustomListActivityAdapter.buildAdapter(
 				this, VolumeType.UDF));
 	}

=== modified file 'src/com/ubuntuone/android/files/util/CustomListActivityAdapter.java'
--- src/com/ubuntuone/android/files/util/CustomListActivityAdapter.java	2010-12-21 18:34:44 +0000
+++ src/com/ubuntuone/android/files/util/CustomListActivityAdapter.java	2010-12-24 00:07:14 +0000
@@ -297,18 +297,20 @@
 	 */
 	public void cd(final Context ctx, final long id) {
 		ContentResolver r = ctx.getContentResolver();
-		String[] dirProjection = new String[]{Files._ID, Files.NODE, Files.NAME};
-		String dirSelection = Files._ID + "=" + id;
-		//String[] dirSelectionArgs = new String[]{new Long(id).toString()};
+		String[] dirProjection = 
+			new String[]{Files._ID, Files.VOLUME, Files.NODE, Files.NAME};
+		String dirSelection = Files._ID + "=?";
+		String[] dirSelectionArgs = new String[]{new Long(id).toString()};
 		Cursor dirC = r.query(Files.CONTENT_URI, 
-				dirProjection, dirSelection, null, null);
+				dirProjection, dirSelection, dirSelectionArgs, null);
+		String volume = null;
 		String node = null;
 		String name = null;
 		if (dirC.moveToFirst()) {
+			volume = dirC.getString(dirC.getColumnIndex(Files.VOLUME));
 			node = dirC.getString(dirC.getColumnIndex(Files.NODE));
 			name = dirC.getString(dirC.getColumnIndex(Files.NAME));
-			mPathTool.cd(node, name);
-			
+			mPathTool.cd(volume, node, name);
 		}
 		dirC.close();
 		

=== modified file 'src/com/ubuntuone/android/files/util/PathTool.java'
--- src/com/ubuntuone/android/files/util/PathTool.java	2010-12-21 16:16:54 +0000
+++ src/com/ubuntuone/android/files/util/PathTool.java	2010-12-24 00:07:14 +0000
@@ -25,47 +25,65 @@
 import java.io.File;
 import java.util.Stack;
 
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.util.Config;
 import android.util.Log;
 
+import com.ubuntuone.android.files.UbuntuOneFiles;
+import com.ubuntuone.android.files.provider.FilesContract.Files;
+import com.ubuntuone.android.files.provider.FilesContract.Volumes;
 import com.ubuntuone.storageprotocol.StorageProtocol.Volumes.VolumeType;
 
 public final class PathTool {
+	private static final String TAG = PathTool.class.getSimpleName();
+	
+	private static boolean LOGV = Config.DEBUG;
+	private static boolean LOGD = Config.DEBUG;
+	private static boolean LOGW = Log.isLoggable(TAG, Log.WARN);
 	
 	public static final String STORAGE_FOLDER = "u1";
+	public static final String PRIMARY_FOLDER = "Ubuntu One";
 	
-	private VolumeType mType;
+	private VolumeType mType = null;
 	private String mVolume = null;
 	private Stack<String> mNodePath = null;
 	private Stack<String> mNamePath = null;
-	
-	public PathTool() {
-		// delegate
-		this(null, null, null);
-	}
-	
+		
 	public PathTool(final VolumeType type) {
-		this();
-		this.mType = type;
-		if (VolumeType.ROOT.toString().equals(type.toString()))
-			mNamePath.push("/Ubuntu One");
-	}
-	
-	public PathTool(final String volume, final String node, final String path) {
-		mVolume = volume;
+		mType = type;
 		mNodePath = new Stack<String>();
-		mNodePath.clear();
 		mNamePath = new Stack<String>();
-		mNamePath.clear();
-		mNamePath.push("sdcard/" + STORAGE_FOLDER);
+		mNamePath.push("sdcard/" + STORAGE_FOLDER);		
 		
-		if (node != null && path != null) {
-			String newPath =  "/" + path;
-			
-			mNodePath.push(node);
-			mNamePath.push(newPath);
-			File f = new File(newPath);
-			f.mkdirs();				
-		}
+		if (VolumeType.ROOT.equals(type)) {
+			mNamePath.push(PRIMARY_FOLDER);
+			// setup root volumeId and nodeId
+			ContentResolver cr = 
+				UbuntuOneFiles.getInstance().getContentResolver();
+			String[] projection = new String[]{Volumes._ID, Volumes.VOLUME, 
+					Volumes.NODE};
+			String selection = Volumes.TYPE + "=?";
+			String[] selectionArgs = new String[]{VolumeType.ROOT.toString()};
+			Cursor c = cr.query(Volumes.CONTENT_URI, projection,
+					selection, selectionArgs, null);
+			String volume = null;
+			String node = null;
+			if (c.moveToFirst()) {
+				volume = c.getString(c.getColumnIndex(Volumes.VOLUME));
+				node = c.getString(c.getColumnIndex(Volumes.NODE));
+			}
+			c.close();
+			if (volume != null && node != null) {
+				mVolume = volume;
+				mNodePath.push(node);
+			} else {
+				if (LOGW) Log.w(TAG, "setting up root PathTool, " +
+						"but volume or node null");
+			}
+			File f = new File(getNamePath());
+			f.mkdirs();
+		}		
 	}
 	
 	public VolumeType getType() {
@@ -111,26 +129,48 @@
 	}
 	
 	public boolean isAtRoot() {
-		return mNodePath.size() == 0;
+		return mNodePath.size() == ((VolumeType.ROOT.equals(mType)) ? 1 : 0); 
 	}
 	
 	/**
 	 * @return cd ..
 	 */
 	public boolean cd() {
-		if (mNodePath.size() > 0) {
-			mNodePath.pop();
-			mNamePath.pop();
-			Log.d("Path", "at " + getNamePath());
-			return true;
+		if (VolumeType.ROOT.equals(mType)) {
+			if (mNodePath.size() > 1) {
+				mNodePath.pop();
+				mNamePath.pop();
+				Log.d(TAG, "path at vol=" + mVolume 
+						+ ", node=" + getCurrentNode() 
+						+ ", path=" + getNamePath());
+				return true;
+			}			
+		} else {
+			if (mNodePath.size() > 0) {
+				mNodePath.pop();
+				mNamePath.pop();
+				if (mNodePath.size() == 0)
+					mVolume = null;
+				Log.d(TAG, "path at vol=" + mVolume 
+						+ ", node=" + getCurrentNode() 
+						+ ", path=" + getNamePath());
+				return true;
+			}
 		}
+		mVolume = null;
 		return false;
 	}
 	
-	public void cd(final String node, final String name) {
+	public void cd(final String volume, final String node, final String name) {
+		// in case of UDF or Share, we have to set mVolume and initial node
+		if (!VolumeType.ROOT.equals(mType) && mNodePath.size() == 0) {
+			mVolume = volume;
+		}
 		mNodePath.push(node);
 		mNamePath.push(name);
-		Log.d("Path", "at " + getNamePath());
+		Log.d(TAG, "path at vol=" + mVolume 
+				+ ", node=" + getCurrentNode() 
+				+ ", path=" + getNamePath());
 	}
 
 	/**