Merge lp:~karni/ubuntuone-android-music/playlist-ux-and-sync into lp:ubuntuone-android-music/v2

[Michał Karnicki]

Added playlist manipulation and sync.

This branch allows adding and removing items from playlists, as well as sync them with U1.
Create new playlist feature is pending minor rework after recent u1-server changes rolled out.

[Roberto Alsina (ralsina)]

Looks good!

review: Approve

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2012-11-08 14:14:54 +0000
+++ AndroidManifest.xml	2012-11-28 17:49:20 +0000
@@ -63,6 +63,11 @@
             android:theme="@style/Theme.Sherlock.Light" >
         </activity>
         <activity
+            android:name=".ui.PlaylistsActivity"
+            android:label="U1 Playlists"
+            android:theme="@style/Theme.Sherlock.Light.Dialog" >
+        </activity>
+        <activity
             android:name=".ui.PlayerActivity"
             android:label="U1 Player"
             android:screenOrientation="portrait" >
@@ -78,6 +83,7 @@
             android:exported="false" >
             <intent-filter>
                 <action android:name="com.ubuntuone.android.music.ACTION_SYNC_MUSIC_METADATA" />
+                <action android:name="com.ubuntuone.android.music.ACTION_SYNC_PLAYLISTS" />
             </intent-filter>
         </service>
         <service
@@ -87,6 +93,7 @@
 
         <provider
             android:name=".provider.MusicProvider"
+            android:exported="false"
             android:authorities="com.ubuntuone.android.music"
             android:label="@string/app_name"
             android:syncable="true"

=== removed file 'res/layout/activity_playlist.xml'
--- res/layout/activity_playlist.xml	2012-09-19 23:50:20 +0000
+++ res/layout/activity_playlist.xml	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="@dimen/header_image_size"
-        android:layout_height="@dimen/header_image_size"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:background="@drawable/ic_action_help"
-        android:minHeight="@dimen/header_image_size"
-        android:minWidth="@dimen/header_image_size" />
-
-    <TextView
-        android:id="@+id/text1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@id/image"
-        android:layout_toRightOf="@id/image"
-        android:gravity="top|left"
-        android:paddingLeft="4dp"
-        android:paddingTop="4dp"
-        android:singleLine="true"
-        android:textStyle="bold"
-        android:textAppearance="@android:style/TextAppearance.Medium"
-        android:textColor="@android:color/primary_text_light" />
-
-    <TextView
-        android:id="@+id/text2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/text1"
-        android:layout_toRightOf="@id/image"
-        android:gravity="top|left"
-        android:paddingLeft="4dp"
-        android:singleLine="true"
-        android:textAppearance="@android:style/TextAppearance.Small"
-        android:textColor="@android:color/tertiary_text_light" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/image"
-        android:layout_toRightOf="@id/image"
-        android:weightSum="2" >
-
-        <Button
-            android:id="@+id/shuffle_all"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/shuffle_all"
-            android:textAppearance="@android:style/TextAppearance.Small"
-            android:onClick="shuffleAll" />
-
-        <Button
-            android:id="@+id/repeat_all"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/repeat_all"
-            android:textAppearance="@android:style/TextAppearance.Small"
-            android:onClick="repeatAll" />
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/songs"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/image" >
-    </FrameLayout>
-
-</RelativeLayout>
\ No newline at end of file

=== added file 'res/layout/activity_playlists.xml'
--- res/layout/activity_playlists.xml	1970-01-01 00:00:00 +0000
+++ res/layout/activity_playlists.xml	2012-11-28 17:49:20 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <fragment
+        android:id="@+id/playlists"
+        android:name="com.ubuntuone.android.music.ui.PlaylistsFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</RelativeLayout>

=== modified file 'res/values/ids.xml'
--- res/values/ids.xml	2012-11-08 14:14:54 +0000
+++ res/values/ids.xml	2012-11-28 17:49:20 +0000
@@ -15,5 +15,6 @@
     <item type="id" name="context_play" />
     <item type="id" name="context_star" />
     <item type="id" name="context_add_to_playlist" />
+    <item type="id" name="context_remove_from_playlist" />
     <item type="id" name="context_add_to_queue" />
 </resources>
\ No newline at end of file

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2012-11-08 14:14:54 +0000
+++ res/values/strings.xml	2012-11-28 17:49:20 +0000
@@ -31,7 +31,11 @@
     <string name="playlist_stats">%1$s songs</string>
     <string name="playlist_title">Playlist title</string>
     <string name="creating_playlist">Creating playlist…</string>
+    <string name="add_to">Add to…</string>
+    <string name="added_to_fmt">Added to %s.</string>
+    <string name="sync_pending">Sync pending</string>
     <string name="creating_playlist_failed_title">Cound\'t create playlist</string>
+    <string name="updating_playlist_failed_title">Cound\'t update playlist</string>
     
     <string name="genres_title">genres</string>
     <string name="genres_loading">Getting genres…</string>
@@ -56,6 +60,7 @@
     <string name="description_play">Play</string>
     <string name="description_star">Star</string>
     <string name="description_add_to_playlist">Add to playlist</string>
+    <string name="description_remove_from_playlist">Remove from playlist</string>
     <string name="description_add_to_queue">Add to queue</string>
     
     <string name="shuffle_all">Shuffle all</string>

=== modified file 'src/com/ubuntuone/android/music/adapter/U1PlaylistAdapter.java'
--- src/com/ubuntuone/android/music/adapter/U1PlaylistAdapter.java	2012-11-22 10:23:21 +0000
+++ src/com/ubuntuone/android/music/adapter/U1PlaylistAdapter.java	2012-11-28 17:49:20 +0000
@@ -157,8 +157,13 @@
 		
 		String name = cursor.getString(cursor.getColumnIndex(Playlists.PLAYLIST_NAME));
 		int length = cursor.getInt(cursor.getColumnIndex(Playlists.PLAYLIST_SONG_COUNT));
-
-		holder.playlistTitle.setText(name);
+		int dirty = cursor.getInt(cursor.getColumnIndex(Playlists.DIRTY));
+		if (dirty != 0) {
+			holder.playlistTitle.setText(String.format("%s [%s]",
+					name, context.getString(R.string.sync_pending)));
+		} else {
+			holder.playlistTitle.setText(name);
+		}
 		// TODO Get plural string resource for item(s).
 		if (length == 0) {
 			holder.playlistSongCount.setText(String.format("No songs", length));

=== modified file 'src/com/ubuntuone/android/music/model/Song.java'
--- src/com/ubuntuone/android/music/model/Song.java	2012-11-08 14:14:54 +0000
+++ src/com/ubuntuone/android/music/model/Song.java	2012-11-28 17:49:20 +0000
@@ -69,7 +69,7 @@
 	
 	public Song(Context context, Uri uri) {
 		ContentResolver resolver = context.getContentResolver();
-		String[] projection = Songs.DEFAULT_PROJECTION;
+		String[] projection = Songs.getDefaultProjection();
 		Cursor cursor = null;
 		try {
 			cursor = resolver.query(uri, projection, null, null, null);

=== modified file 'src/com/ubuntuone/android/music/provider/MusicContract.java'
--- src/com/ubuntuone/android/music/provider/MusicContract.java	2012-11-21 15:03:12 +0000
+++ src/com/ubuntuone/android/music/provider/MusicContract.java	2012-11-28 17:49:20 +0000
@@ -153,6 +153,8 @@
 		String PLAYLIST_SONG_COUNT = "playlist_song_count";
 		/** Full URL to this playlist online. */
 		String PLAYLIST_URL = "playlist_url";
+		/** Flag indicating playlist should be sync'ed up. */
+		String DIRTY = "dirty";
 	}
 	
 	interface PlaylistSongsColumns extends SongsColumns
@@ -376,7 +378,7 @@
 				.buildUpon().appendPath(PATH_CACHED).build();
 		
 		/** Default query projection. */
-		public static final String[] DEFAULT_PROJECTION = new String[] {
+		private static final String[] DEFAULT_PROJECTION = new String[] {
 			Songs._ID, Songs.SONG_ID, Songs.SONG_TITLE, Songs.SONG_ALBUM,
 			Songs.SONG_ALBUM_ID, Songs.SONG_ALBUM_ARTIST,
 			Songs.SONG_ARTIST, Songs.SONG_ARTIST_ID, Songs.SONG_GENRE,
@@ -385,6 +387,12 @@
 			Songs.SONG_BIT_RATE, Songs.SONG_SUFFIX, Songs.SONG_CONTENT_TYPE,
 			Songs.SONG_PATH, Songs.SONG_LAST_PLAYED_AT, Songs.STARRED, Songs.SONG_IS_PLAYING,
 		};
+		
+		public static String[] getDefaultProjection() {
+			// karni: Earn $10 and tell me why you have to return a COPY of a *static final* for it
+			// not to change here, in MusicContract#DEFAULT_PROJECTION. Platform bug?
+			return DEFAULT_PROJECTION.clone();
+		}
 
 		/** Default "ORDER BY" clause. */
 		public static final String DEFAULT_SORT = SongsColumns.SONG_TITLE
@@ -435,7 +443,7 @@
 		/** Default query projection. */
 		public static final String[] DEFAULT_PROJECTION = new String[] {
 			Playlists._ID, Playlists.PLAYLIST_ID, Playlists.PLAYLIST_NAME,
-			Playlists.PLAYLIST_SONG_COUNT, Playlists.STARRED
+			Playlists.PLAYLIST_SONG_COUNT, Playlists.STARRED, Playlists.DIRTY
 		};
 		
 		public static final String[] SONGS_DEFAULT_PROJECTION = new String[] {
@@ -503,7 +511,7 @@
 	}
 	
 	public static class PlaylistSongs implements PlaylistSongsColumns, SyncColumns,
-			SongsColumns, BaseColumns
+			SongsColumns, StarredColumn, BaseColumns
 	{
 		public static final Uri CONTENT_URI = BASE_CONTENT_URI.buildUpon()
 				.appendPath(PATH_PLAYLISTS_SONGS).build();

=== modified file 'src/com/ubuntuone/android/music/provider/MusicDatabase.java'
--- src/com/ubuntuone/android/music/provider/MusicDatabase.java	2012-11-21 15:03:12 +0000
+++ src/com/ubuntuone/android/music/provider/MusicDatabase.java	2012-11-28 17:49:20 +0000
@@ -202,6 +202,7 @@
 				+ PlaylistsColumns.PLAYLIST_NAME + " TEXT NOT NULL, "
 				+ PlaylistsColumns.PLAYLIST_SONG_COUNT + " INTEGER NOT NULL DEFAULT 0, "
 				+ PlaylistsColumns.PLAYLIST_URL + " TEXT NOT NULL, "
+				+ PlaylistsColumns.DIRTY + " INTEGER NOT NULL DEFAULT 0, "
 				+ "UNIQUE (" + PlaylistsColumns.PLAYLIST_ID + ") ON CONFLICT IGNORE)");
 		
 		// Create the play queue playlist.

=== modified file 'src/com/ubuntuone/android/music/provider/MusicProvider.java'
--- src/com/ubuntuone/android/music/provider/MusicProvider.java	2012-11-22 10:23:21 +0000
+++ src/com/ubuntuone/android/music/provider/MusicProvider.java	2012-11-28 17:49:20 +0000
@@ -602,18 +602,18 @@
 			final String playlistId = Playlists.getPlaylistId(uri);
 			return builder.table(Tables.PLAYLIST_SONGS_JOIN_SONGS)
 					.where(PlaylistSongs.PLAYLIST_ID + "=?", playlistId)
-					.mapToTable(Songs._ID, Tables.SONGS)
-					.mapToTable(Songs.SONG_ID, Tables.SONGS);
+					.mapToTable(PlaylistSongs._ID, Tables.PLAYLISTS_SONGS)
+					.mapToTable(PlaylistSongs.SONG_ID, Tables.SONGS);
 		}
 		case PLAYLISTS_ID_SONGS_ID: {
 			final String playlistId = Playlists.getPlaylistId(uri);
 			final String songId = Playlists.getSongId(uri);
-			return builder.table(Tables.PLAYLISTS_SONGS)
+			return builder.table(Tables.PLAYLIST_SONGS_JOIN_SONGS)
 					.where(PlaylistSongs.PLAYLIST_ID + "=?", playlistId)
 					.where(PlaylistSongs.SONG_ID + "=?", songId)
-					.mapToTable(Songs._ID, Tables.SONGS)
-					.mapToTable(Songs.SONG_ID, Tables.SONGS)
-					.mapToTable(Songs.STARRED, Tables.SONGS);
+					.mapToTable(PlaylistSongs._ID, Tables.PLAYLISTS_SONGS)
+					.mapToTable(PlaylistSongs.SONG_ID, Tables.SONGS)
+					.mapToTable(PlaylistSongs.STARRED, Tables.SONGS);
 		}
 		
 		case GENRES: {

=== modified file 'src/com/ubuntuone/android/music/provider/MusicProviderUtils.java'
--- src/com/ubuntuone/android/music/provider/MusicProviderUtils.java	2012-11-21 15:03:12 +0000
+++ src/com/ubuntuone/android/music/provider/MusicProviderUtils.java	2012-11-28 17:49:20 +0000
@@ -23,6 +23,7 @@
 
 import static com.ubuntuone.android.music.util.LogUtils.makeLogTag;
 
+import java.util.ArrayList;
 import java.util.Random;
 
 import android.content.ContentResolver;
@@ -208,11 +209,14 @@
 	
 	public static int getPlaylistSongCount(Context context, Uri playlistUri) {
 		ContentResolver resolver = context.getContentResolver();
+		String playlistId = Playlists.getPlaylistId(playlistUri);
+		Uri playlistSongsUri = Playlists.buildPlaylistSongsUri(playlistId);
+		
 		String[] projection = new String[] { Songs._ID };
 		Cursor cursor = null;
 		int count = -1;
 		try {
-			cursor = resolver.query(playlistUri, projection, null, null, null);
+			cursor = resolver.query(playlistSongsUri, projection, null, null, null);
 			count = (cursor != null) ? cursor.getCount() : 0;
 		} finally {
 			if (cursor != null) cursor.close();
@@ -220,6 +224,28 @@
 		return count;
 	}
 	
+	public static ArrayList<String> getPlaylistSongIdList(Context context, String playlistId) {
+		ContentResolver resolver = context.getContentResolver();
+		Uri playlistSongsUri = Playlists.buildPlaylistSongsUri(playlistId);
+		ArrayList<String> songIdList = new ArrayList<String>();
+		
+		String[] projection = new String[] { PlaylistSongs.SONG_ID };
+		Cursor cursor = null;
+		try {
+			cursor = resolver.query(playlistSongsUri, projection, null, null, null);
+			if (cursor != null && cursor.isBeforeFirst()) {
+				while (cursor.moveToNext()) {
+					String songId = cursor.getString(cursor.getColumnIndex(PlaylistSongs.SONG_ID));
+					songIdList.add(songId);
+				}
+			}
+		} finally {
+			if (cursor != null) cursor.close();
+		}
+		
+		return songIdList;
+	}
+	
 	public static int getPlayQueueSongCount(Context context) {
 		Uri playQueueUri = Playlists.buildPlaylistSongsUri(QUEUE_ID);
 		return getPlaylistSongCount(context, playQueueUri);
@@ -236,14 +262,55 @@
 		Uri playQueueUri = Playlists.buildPlaylistSongsUri(MusicProviderUtils.QUEUE_ID);
 		clearPlaylist(context, playQueueUri);
 	}
-
+	
+	/**
+	 * Updates playlist song count, saves one request to the server upon
+	 * enqueuing content.
+	 * 
+	 * @param context
+	 *            The context to use.
+	 * @param playlistUri
+	 *            Playlist Uri of which song count to update.
+	 */
+	public static void updatePlaylistSongCount(Context context, Uri playlistUri) {
+		ContentResolver resolver = context.getContentResolver();
+		ContentValues values = new ContentValues();
+		int songCount = MusicProviderUtils.getPlaylistSongCount(context, playlistUri);
+		values.put(Playlists.PLAYLIST_SONG_COUNT, songCount);
+		resolver.update(playlistUri, values, null, null);
+	}
+	
+	/**
+	 * Flags the playlist as dirty for sync up. Next time metadata is refreshed,
+	 * dirty playlists are first saved to the server.
+	 * 
+	 * @param context
+	 *            The context to use.
+	 * @param playlistUri
+	 *            Uri of the playlist to flag.
+	 * @param isDirty
+	 *            true to mark for sync up, false otherwise.
+	 */
+	public static void flagPlaylistForSync(Context context, Uri playlistUri, boolean isDirty) {
+		ContentResolver resolver = context.getContentResolver();
+		ContentValues values = new ContentValues();
+		values.put(Playlists.DIRTY, isDirty);
+		resolver.update(playlistUri, values, null, null);
+	}
+	
 	public static void enqueueSong(Context context, Uri songUri, Uri playlistUri) {
 		ContentResolver resolver = context.getContentResolver();
 		String playlistId = Playlists.getPlaylistId(playlistUri);
 		String songId = Songs.getSongId(songUri);
+		Uri playlistSongsUri = Playlists.buildPlaylistSongsUri(playlistId);
 		
 		ContentValues values = MusicContentValues.forPlaylistSong(playlistId, songId);
-		resolver.insert(playlistUri, values);
+		resolver.insert(playlistSongsUri, values);
+		
+		if (!QUEUE_ID.equals(playlistId)) {
+			updatePlaylistSongCount(context, playlistUri);
+			flagPlaylistForSync(context, playlistUri, true);
+		}
 	}
 	
 	public static void enqueueSong(Context context, Uri songUri) {

=== modified file 'src/com/ubuntuone/android/music/service/MusicService.java'
--- src/com/ubuntuone/android/music/service/MusicService.java	2012-11-21 15:03:12 +0000
+++ src/com/ubuntuone/android/music/service/MusicService.java	2012-11-28 17:49:20 +0000
@@ -41,6 +41,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.database.sqlite.SQLiteDatabaseLockedException;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.MediaPlayer.OnErrorListener;
@@ -57,6 +58,7 @@
 import com.ubuntuone.android.music.UbuntuOneMusic;
 import com.ubuntuone.android.music.model.PlayerState;
 import com.ubuntuone.android.music.model.Song;
+import com.ubuntuone.android.music.provider.MusicContract.Songs;
 import com.ubuntuone.android.music.provider.MusicProviderUtils;
 import com.ubuntuone.android.music.util.UIUtils;
 import com.ubuntuone.api.music.U1MusicAPI;
@@ -123,9 +125,13 @@
 		this.mShufflePlay = sharedPrefs.getBoolean(SHUFFLE_PREFERENCE_KEY, false);
 		this.mRepeatPlay = sharedPrefs.getBoolean(REPEAT_PREFERENCE_KEY, false);
 		
-		Uri songUri = MusicProviderUtils.getPlayingSong(this);
-		if (songUri != null) {
-			mCurrentPlaying = new Song(this, songUri);
+		try {
+			Uri songUri = MusicProviderUtils.getPlayingSong(this);
+			if (songUri != null) {
+				mCurrentPlaying = new Song(this, songUri);
+			}
+		} catch (SQLiteDatabaseLockedException e) {
+			// Ignore. Assume no song has been playing.
 		}
 	}
 	
@@ -325,8 +331,13 @@
 	}
 	
 	private synchronized void setCurrentPlaying(Uri uri) {
-		MusicProviderUtils.setPlayingSong(this, uri);
-		this.mCurrentPlaying = new Song(this, uri);
+		// Make sure this is a song Uri, rather than playlist song Uri.
+		// This has to be changed when "now playing" column is moved to the PlaylistSongs table.
+		String songId = Songs.getSongId(uri);
+		Uri songUri = Songs.buildSongUri(songId);
+		
+		MusicProviderUtils.setPlayingSong(this, songUri);
+		this.mCurrentPlaying = new Song(this, songUri);
 		callbackOnSongChanged();
 		if (mCurrentPlaying.isCompleteFileAvailable()) {
 			callbackOnSongDownload(uri, 100);

=== modified file 'src/com/ubuntuone/android/music/service/SyncService.java'
--- src/com/ubuntuone/android/music/service/SyncService.java	2012-11-28 17:49:20 +0000
+++ src/com/ubuntuone/android/music/service/SyncService.java	2012-11-28 17:49:20 +0000
@@ -22,12 +22,16 @@
 package com.ubuntuone.android.music.service;
 
 import static com.ubuntuone.android.music.util.LogUtils.makeLogTag;
+
+import java.util.ArrayList;
+
 import android.app.IntentService;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.ResultReceiver;
 import android.util.Log;
@@ -58,6 +62,7 @@
 import com.ubuntuone.api.music.model.U1Song;
 import com.ubuntuone.api.music.request.U1AlbumListener;
 import com.ubuntuone.api.music.request.U1ArtistListener;
+import com.ubuntuone.api.music.request.U1CallbackListener;
 import com.ubuntuone.api.music.request.U1PlaylistListener;
 import com.ubuntuone.api.music.request.U1SongListener;
 
@@ -67,6 +72,8 @@
 	
 	public static final String ACTION_SYNC_MUSIC_METADATA =
 			"com.ubuntuone.android.music.ACTION_SYNC_MUSIC_METADATA";
+	public static final String ACTION_SYNC_PLAYLISTS =
+			"com.ubuntuone.android.music.ACTION_SYNC_PLAYLISTS";
 	
 	public static final String EXTRA_RECEIVER = "result_receiver";
 	public static final String EXTRA_LOADER_ID = "loader_id";
@@ -103,19 +110,25 @@
 	@Override
 	protected void onHandleIntent(Intent intent) {
 		final String action = intent.getAction();
+		if (action == null) return;
 		mReceiver = intent.getParcelableExtra(EXTRA_RECEIVER);
-		if (action != null && ACTION_SYNC_MUSIC_METADATA.equals(action)) {
-			mTimeSyncStarted = System.currentTimeMillis();
-			if (mApi != null && UbuntuOneMusic.SHOULD_SYNC) {
-				sSyncStatus = SYNC_STARTED;
-				if (mReceiver != null) mReceiver.send(SYNC_STARTED, Bundle.EMPTY);
+		mTimeSyncStarted = System.currentTimeMillis();
+		if (mApi != null && UbuntuOneMusic.SHOULD_SYNC) {
+			sSyncStatus = SYNC_STARTED;
+			if (mReceiver != null) mReceiver.send(SYNC_STARTED, Bundle.EMPTY);
+			
+			if (ACTION_SYNC_MUSIC_METADATA.equals(action)) {
+				syncPlaylistMetadata();
 				syncMusicMetadata();
-				if (mReceiver != null) mReceiver.send(SYNC_FINISHED, Bundle.EMPTY);
-				sSyncStatus = SYNC_FINISHED;
+			} else if (ACTION_SYNC_PLAYLISTS.equals(action)) {
+				syncPlaylistMetadata();
 			}
-			long now = System.currentTimeMillis();
-			Log.i(TAG, "Ubuntu One music metadata sync sync took " + (now - mTimeSyncStarted) + " ms");
+			
+			if (mReceiver != null) mReceiver.send(SYNC_FINISHED, Bundle.EMPTY);
+			sSyncStatus = SYNC_FINISHED;
 		}
+		long now = System.currentTimeMillis();
+		Log.i(TAG, "Ubuntu One music metadata sync sync took " + (now - mTimeSyncStarted) + " ms");
 	}
 	
 	private void syncMusicMetadata() {
@@ -130,6 +143,10 @@
 		}
 	}
 	
+	private void syncPlaylistMetadata() {
+		syncUpPlaylists();
+	}
+	
 	private void syncArtists() {
 		final long timeMillis = System.currentTimeMillis();
 		mApi.getArtists(mArtistListener);
@@ -158,6 +175,38 @@
 		Log.i(TAG, "Playlists sync took " + (nowMillis - timeMillis) + "ms");
 	}
 	
+	private void syncUpPlaylists() {
+		final long timeMillis = System.currentTimeMillis();
+		Cursor cursor = null;
+		try {
+			String[] projection = new String[] { Playlists.PLAYLIST_ID, Playlists.PLAYLIST_NAME };
+			String selection = Playlists.DIRTY + "=1";
+			cursor = getContentResolver().query(Playlists.CONTENT_URI,
+					projection, selection, null, null);
+			if (cursor != null && cursor.isBeforeFirst()) {
+				while (cursor.moveToNext()) {
+					final String playlistId = cursor.getString(cursor.getColumnIndex(Playlists.PLAYLIST_ID));
+					String playlistName = cursor.getString(cursor.getColumnIndex(Playlists.PLAYLIST_NAME));
+					ArrayList<String> songIdList = MusicProviderUtils.getPlaylistSongIdList(this, playlistId);
+					
+					mApi.updatePlaylist(playlistId, playlistName, songIdList, new U1CallbackListener() {
+						@Override
+						public void onSuccess() {
+							Log.i(TAG, "Updated playlist: " + playlistId);
+							Uri playlistUri = Playlists.buildPlaylistUri(playlistId);
+							MusicProviderUtils.flagPlaylistForSync(SyncService.this, playlistUri, false);
+							// TODO Persist playlist entity from response once CSRF fix is rolled out.
+						}
+					});
+				}
+			}
+		} finally {
+			if (cursor != null) cursor.close();
+		}
+		final long nowMillis = System.currentTimeMillis();
+		Log.i(TAG, "Playlist songs sync up took " + (nowMillis - timeMillis) + "ms");
+	}
+	
 	private void syncPlaylistSongs() {
 		final long timeMillis = System.currentTimeMillis();
 		Cursor cursor = null;
@@ -175,7 +224,7 @@
 			if (cursor != null) cursor.close();
 		}
 		final long nowMillis = System.currentTimeMillis();
-		Log.i(TAG, "Playlist songs sync took " + (nowMillis - timeMillis) + "ms");
+		Log.i(TAG, "Playlist songs sync down took " + (nowMillis - timeMillis) + "ms");
 	}
 	
 	private U1ArtistListener mArtistListener = new U1ArtistListener() {

=== modified file 'src/com/ubuntuone/android/music/ui/AlbumsFragment.java'
--- src/com/ubuntuone/android/music/ui/AlbumsFragment.java	2012-11-22 10:23:21 +0000
+++ src/com/ubuntuone/android/music/ui/AlbumsFragment.java	2012-11-28 17:49:20 +0000
@@ -25,6 +25,7 @@
 import static com.ubuntuone.android.music.util.LogUtils.makeLogTag;
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
@@ -187,7 +188,13 @@
 	}
 	
 	private boolean onAddToPlaylistContextItemSelected(int position) {
-		// TODO
+		Cursor cursor = (Cursor) mListView.getItemAtPosition(position);
+		String albumId = cursor.getString(cursor.getColumnIndex(Albums.ALBUM_ID));
+		Uri albumUri = Albums.buildAlbumUri(albumId);
+		
+		Intent intent = new Intent(getActivity(), PlaylistsActivity.class);
+		intent.putExtra(PlaylistsActivity.EXTRA_ENQUEUE_CONTENT_ID, albumUri);
+		startActivity(intent);
 		return true;
 	}
 	

=== modified file 'src/com/ubuntuone/android/music/ui/HomeActivity.java'
--- src/com/ubuntuone/android/music/ui/HomeActivity.java	2012-11-21 15:03:12 +0000
+++ src/com/ubuntuone/android/music/ui/HomeActivity.java	2012-11-28 17:49:20 +0000
@@ -44,8 +44,10 @@
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.support.v4.view.ViewPager;
+import android.support.v4.widget.CursorAdapter;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.Adapter;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
@@ -55,22 +57,26 @@
 import com.actionbarsherlock.view.MenuItem;
 import com.ubuntuone.android.music.R;
 import com.ubuntuone.android.music.UbuntuOneMusic;
+import com.ubuntuone.android.music.adapter.U1PlaylistAdapter;
+import com.ubuntuone.android.music.adapter.U1PlaylistAdapter.Position;
 import com.ubuntuone.android.music.adapter.holder.NowPlayingViewHolder;
 import com.ubuntuone.android.music.model.PlayerState;
+import com.ubuntuone.android.music.provider.MusicContract.Playlists;
 import com.ubuntuone.android.music.provider.MusicContract.Songs;
 import com.ubuntuone.android.music.provider.MusicProviderUtils;
 import com.ubuntuone.android.music.service.MusicService;
 import com.ubuntuone.android.music.service.MusicServiceBinder;
 import com.ubuntuone.android.music.service.MusicServiceCallback;
 import com.ubuntuone.android.music.service.SyncService;
+import com.ubuntuone.android.music.ui.PlaylistsFragment.OnPlaylistSelectedListener;
 import com.ubuntuone.android.music.ui.dialog.InputAlertDialog.InputAlertDialogListener;
 import com.ubuntuone.android.music.util.AccountUtils;
 import com.ubuntuone.android.music.util.U1ImageDownloader;
 import com.ubuntuone.android.music.util.UIUtils;
 
 public class HomeActivity extends SherlockFragmentActivity implements ActionBar.TabListener,
-		ViewPager.OnPageChangeListener, OnClickListener, InputAlertDialogListener,
-		MusicServiceCallback
+		ViewPager.OnPageChangeListener, OnClickListener, OnPlaylistSelectedListener,
+		InputAlertDialogListener, MusicServiceCallback
 {
 	@SuppressWarnings("unused")
 	private static final String TAG = makeLogTag(HomeActivity.class);
@@ -80,7 +86,7 @@
 	private static final int REQUEST_AUTHENTICATE = 1;
 	
 	/* package */ static final int PLEASE_WAIT_DIALOG_ID = 1;
-	/* package */ static final int INFO_DIALOG_ID = 2;
+	/* package */ static final int ERROR_DIALOG_ID = 2;
 	/* package */ static final int CREATE_PLAYLIST_DIALOG_ID = 3;
 	
 	private Handler mHandler = new Handler();
@@ -572,7 +578,47 @@
 			mShuffleAllSongsTask = null;
 		}
 	}
-
+	
+	@Override
+	public void onPlaylistSelected(Adapter adapter, int position, boolean hasHeaders) {
+		if (hasHeaders && position < U1PlaylistAdapter.Position.COUNT) {
+			switch (position) {
+			case Position.STARRED: {
+				int count = MusicProviderUtils.getStarredSongCount(this);
+				PlaylistActivity.startFrom(this, MusicProviderUtils.STARRED_ID,
+						getString(R.string.starred), count);
+				break;
+			}
+			case Position.CACHED: {
+				int count = MusicProviderUtils.getCachedSongCount(this);
+				PlaylistActivity.startFrom(this, MusicProviderUtils.CACHED_ID,
+						getString(R.string.cached), count);
+				break;
+			}
+			case Position.QUEUED: {
+				PlayerActivity.startWithQueue(this);
+				break;
+			}
+			}
+		} else {
+			if (hasHeaders) position -= Position.COUNT;
+			
+			Cursor cursor = ((CursorAdapter) adapter).getCursor();
+			cursor.moveToPosition(position);
+			
+			int songCount = cursor.getInt(cursor.getColumnIndex(Playlists.PLAYLIST_SONG_COUNT));
+			if (songCount == 0) {
+				String title = cursor.getString(cursor.getColumnIndex(Playlists.PLAYLIST_NAME));
+				String text = getString(R.string.playlist_is_empty, title);
+				if (!isFinishing()) {
+					Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
+				}
+			} else {
+				PlaylistActivity.startFrom(this, cursor);
+			}
+		}
+	}
+	
 	@Override
 	public void onClick(View v) {
 		switch (v.getId()) {

=== modified file 'src/com/ubuntuone/android/music/ui/PlayerFragment.java'
--- src/com/ubuntuone/android/music/ui/PlayerFragment.java	2012-11-08 14:14:54 +0000
+++ src/com/ubuntuone/android/music/ui/PlayerFragment.java	2012-11-28 17:49:20 +0000
@@ -401,7 +401,7 @@
 
 		Uri playlistSongsUri = Playlists.buildPlaylistSongsUri(MusicProviderUtils.QUEUE_ID);
 		CursorLoader loader = new CursorLoader(getSherlockActivity(), playlistSongsUri,
-				Songs.DEFAULT_PROJECTION, null, null, PlaylistSongs.DEFAULT_SORT);
+				Songs.getDefaultProjection(), null, null, PlaylistSongs.DEFAULT_SORT);
 		
 		setIsLoading(true);
 		return loader;

=== modified file 'src/com/ubuntuone/android/music/ui/PlaylistActivity.java'
--- src/com/ubuntuone/android/music/ui/PlaylistActivity.java	2012-11-08 14:14:54 +0000
+++ src/com/ubuntuone/android/music/ui/PlaylistActivity.java	2012-11-28 17:49:20 +0000
@@ -58,7 +58,6 @@
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		// TODO Rename layout?
 		setContentView(R.layout.activity_collection);
 		
 		mPlaylistArt = (ImageView) findViewById(R.id.image);

=== modified file 'src/com/ubuntuone/android/music/ui/PlaylistsActivity.java'
--- src/com/ubuntuone/android/music/ui/PlaylistsActivity.java	2012-11-08 14:14:54 +0000
+++ src/com/ubuntuone/android/music/ui/PlaylistsActivity.java	2012-11-28 17:49:20 +0000
@@ -21,16 +21,158 @@
 
 package com.ubuntuone.android.music.ui;
 
+import static com.ubuntuone.android.music.ui.HomeActivity.ERROR_DIALOG_ID;
+import static com.ubuntuone.android.music.util.LogUtils.makeLogTag;
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.Loader;
+import android.support.v4.widget.CursorAdapter;
+import android.util.Log;
+import android.widget.Adapter;
+import android.widget.Toast;
+
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.MenuItem;
+import com.ubuntuone.android.music.R;
 import com.ubuntuone.android.music.provider.MusicContract.Albums;
 import com.ubuntuone.android.music.provider.MusicContract.Artists;
+import com.ubuntuone.android.music.provider.MusicContract.Playlists;
 import com.ubuntuone.android.music.provider.MusicContract.Songs;
+import com.ubuntuone.android.music.provider.MusicProviderUtils;
+import com.ubuntuone.android.music.service.SyncService;
+import com.ubuntuone.android.music.ui.PlaylistsFragment.OnPlaylistSelectedListener;
+import com.ubuntuone.android.music.ui.dialog.InfoAlertDialog.InfoAlertDialogListener;
+import com.ubuntuone.android.music.util.UIUtils;
 
-public class PlaylistsActivity extends SherlockFragmentActivity
+public class PlaylistsActivity extends SherlockFragmentActivity implements
+		OnPlaylistSelectedListener, InfoAlertDialogListener
 {
-	public static final String EXTRA_ENQUEUE_SONG_ID = Songs.SONG_ID;
-	public static final String EXTRA_ENQUEUE_ALBUM_ID = Albums.ALBUM_ID;
-	public static final String EXTRA_ENQUEUE_ARTIST_ID = Artists.ARTIST_ID;
-	
-	// TODO enqueue provided content to selected playlist, allow creating a playlist
+	private static final String TAG = makeLogTag(PlaylistActivity.class);
+	
+	public static final String EXTRA_ENQUEUE_CONTENT_ID = "content_uri";
+	
+	private Uri mContentUri;
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_playlists);
+		
+		mContentUri = getIntent().getParcelableExtra(EXTRA_ENQUEUE_CONTENT_ID);
+		
+		if (mContentUri == null) {
+			throw new IllegalStateException("You must provide content_uri which is " +
+					"to be added to a playlist.");
+		}
+
+		LoaderManager lm = getSupportLoaderManager();
+		Loader<?> loader = lm.getLoader(R.id.playlist_songs_loader_id);
+		if (loader != null) {
+			loader.stopLoading();
+		}
+	}
+	
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case android.R.id.home:
+			finish();
+			return true;
+
+		default:
+			return super.onOptionsItemSelected(item);
+		}
+	}
+
+	@Override
+	public void onPlaylistSelected(Adapter adapter, int position, boolean hasHeaders) {
+		if (hasHeaders) {
+			throw new IllegalArgumentException(
+					"PlaylistsActivity must not contain custom playlists.");
+		}
+		
+		Cursor cursor = ((CursorAdapter) adapter).getCursor();
+		cursor.moveToPosition(position);
+		
+		String playlistId = cursor.getString(cursor.getColumnIndex(Playlists.PLAYLIST_ID));
+		Uri playlistUri = Playlists.buildPlaylistUri(playlistId);
+		
+		if (mContentUri != null) {
+			AppendToPlaylistTask appendTask = new AppendToPlaylistTask();
+			appendTask.execute(playlistUri, mContentUri);
+		}
+	}
+	
+	private class AppendToPlaylistTask extends AsyncTask<Uri, Void, Uri> {
+		@Override
+		protected Uri doInBackground(Uri... params) {
+			if (params.length != 2) {
+				throw new IllegalArgumentException(
+						"AppendToPlaylistTask takes two arguments, playlist uri and content uri");
+			}
+			final Uri playlistUri = params[0];
+			final Uri contentUri = params[1];
+			
+			ContentResolver resolver = getContentResolver();
+			
+			String mimeType = resolver.getType(contentUri);
+			Activity activity = PlaylistsActivity.this;
+			if (mimeType.equals(Artists.CONTENT_ITEM_TYPE)) {
+				Log.e(TAG, "artist");
+				MusicProviderUtils.enqueueArtist(activity, contentUri, playlistUri);
+			} else if (mimeType.equals(Albums.CONTENT_ITEM_TYPE)) {
+				Log.e(TAG, "album");
+				MusicProviderUtils.enqueueAlbum(activity, contentUri, playlistUri);
+			} else if (mimeType.equals(Songs.CONTENT_ITEM_TYPE)) {
+				Log.e(TAG, "song");
+				MusicProviderUtils.enqueueSong(activity, contentUri, playlistUri);
+			} else {
+				Log.e(TAG, "Unknown content uri to enqueue to playlist: " + contentUri.toString());
+			}
+			return playlistUri;
+		}
+
+		@Override
+		protected void onPostExecute(Uri playlistUri) {
+			if (playlistUri == null) {
+				Log.e(TAG, "PlaylistsActivity#AppendToPlaylistTask#onPostExecute null playlistUri");
+				return;
+			}
+			
+			String playlistName = null;
+			Cursor cursor = null;
+			try {
+				final String[] projection = new String[] { Playlists.PLAYLIST_NAME };
+				cursor = getContentResolver().query(playlistUri, projection, null, null, null);
+				if (cursor != null && cursor.moveToFirst()) {
+					playlistName = cursor.getString(cursor.getColumnIndex(Playlists.PLAYLIST_NAME));
+				}
+			} finally {
+				cursor.close();
+			}
+			
+			String msg = getString(R.string.added_to_fmt, playlistName);
+			Toast.makeText(PlaylistsActivity.this, msg, Toast.LENGTH_SHORT).show();
+			
+			if (UIUtils.isNetworkConnected(PlaylistsActivity.this)) {
+				Intent syncPlaylists = new Intent(SyncService.ACTION_SYNC_PLAYLISTS);
+				startService(syncPlaylists);
+			}
+			
+			finish();
+		}
+	}
+
+	@Override
+	public void onPositiveButtonClicked(int dialogId) {
+		if (dialogId == ERROR_DIALOG_ID) {
+			finish();
+		}
+	}
 }

=== modified file 'src/com/ubuntuone/android/music/ui/PlaylistsFragment.java'
--- src/com/ubuntuone/android/music/ui/PlaylistsFragment.java	2012-11-22 10:23:21 +0000
+++ src/com/ubuntuone/android/music/ui/PlaylistsFragment.java	2012-11-28 17:49:20 +0000
@@ -21,7 +21,7 @@
 
 package com.ubuntuone.android.music.ui;
 
-import static com.ubuntuone.android.music.ui.HomeActivity.INFO_DIALOG_ID;
+import static com.ubuntuone.android.music.ui.HomeActivity.ERROR_DIALOG_ID;
 import static com.ubuntuone.android.music.util.LogUtils.makeLogTag;
 
 import java.util.ArrayList;
@@ -30,7 +30,6 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
@@ -44,27 +43,26 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.Adapter;
 import android.widget.Button;
 import android.widget.ListView;
-import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.ubuntuone.android.music.R;
 import com.ubuntuone.android.music.UbuntuOneMusic;
 import com.ubuntuone.android.music.adapter.U1PlaylistAdapter;
-import com.ubuntuone.android.music.adapter.U1PlaylistAdapter.Position;
-import com.ubuntuone.android.music.provider.MusicContract.Albums;
-import com.ubuntuone.android.music.provider.MusicContract.Artists;
 import com.ubuntuone.android.music.provider.MusicContract.Playlists;
-import com.ubuntuone.android.music.provider.MusicContract.Songs;
 import com.ubuntuone.android.music.provider.MusicProviderUtils;
+import com.ubuntuone.android.music.provider.dao.PlaylistDao;
 import com.ubuntuone.android.music.ui.dialog.InfoAlertDialog;
 import com.ubuntuone.android.music.ui.dialog.InputAlertDialog;
 import com.ubuntuone.android.music.ui.dialog.InputAlertDialog.InputAlertDialogListener;
 import com.ubuntuone.android.music.ui.dialog.ModalAlertDialog;
 import com.ubuntuone.api.music.U1MusicAPI;
 import com.ubuntuone.api.music.client.Failure;
+import com.ubuntuone.api.music.model.U1Playlist;
 import com.ubuntuone.api.music.request.U1PlaylistCreateListener;
+import com.ubuntuone.api.music.request.U1PlaylistListener;
 
 public class PlaylistsFragment extends LoadingFragment<U1PlaylistAdapter> implements
 		OnClickListener, InputAlertDialogListener
@@ -74,6 +72,8 @@
 	public static final String EXTRA_INCLUDE_CUSTOM = "include_custom";
 	
 	private boolean mIncludeCustom = false;
+	
+	private OnPlaylistSelectedListener mOnPlaylistSelectedListener;
 
 	@Override
 	public int onGetHeaderResId() {
@@ -113,52 +113,18 @@
 		Button createPlaylist = (Button) view.findViewById(R.id.create_playlist);
 		createPlaylist.setOnClickListener(this);
 		
+		try {
+			mOnPlaylistSelectedListener = (OnPlaylistSelectedListener) getActivity();
+		} catch (ClassCastException e) {
+			throw new IllegalArgumentException("Activity must implement OnPlaylistSelectedListener");
+		}
+		
 		return view;
 	}
 	
 	@Override
 	public void onListItemClick(ListView l, View v, int position, long id) {
-		showPlaylistSongs(position);
-	}
-	
-	private void showPlaylistSongs(int position) {
-		if (mIncludeCustom && position < U1PlaylistAdapter.Position.COUNT) {
-			Context context = getActivity();
-			switch (position) {
-			case Position.STARRED: {
-				int count = MusicProviderUtils.getStarredSongCount(context);
-				PlaylistActivity.startFrom(context, MusicProviderUtils.STARRED_ID,
-						context.getString(R.string.starred), count);
-				break;
-			}
-			case Position.CACHED: {
-				int count = MusicProviderUtils.getCachedSongCount(context);
-				PlaylistActivity.startFrom(getActivity(), MusicProviderUtils.CACHED_ID,
-						context.getString(R.string.cached), count);
-				break;
-			}
-			case Position.QUEUED: {
-				PlayerActivity.startWithQueue(getSherlockActivity());
-				break;
-			}
-			}
-		} else {
-			if (mIncludeCustom) position -= Position.COUNT;
-			
-			Cursor cursor = mAdapter.getCursor();
-			cursor.moveToPosition(position);
-			
-			int songCount = cursor.getInt(cursor.getColumnIndex(Playlists.PLAYLIST_SONG_COUNT));
-			if (songCount == 0) {
-				String title = cursor.getString(cursor.getColumnIndex(Playlists.PLAYLIST_NAME));
-				String text = getString(R.string.playlist_is_empty, title);
-				if (isResumed()) {
-					Toast.makeText(getActivity(), text, Toast.LENGTH_SHORT).show();
-				}
-			} else {
-				PlaylistActivity.startFrom(getActivity(), cursor);
-			}
-		}
+		mOnPlaylistSelectedListener.onPlaylistSelected(mAdapter, position, mIncludeCustom);
 	}
 
 	@Override
@@ -238,6 +204,7 @@
 			api.createPlaylist(name, emptyList, new U1PlaylistCreateListener() {
 				@Override
 				public void onSuccess(String playlistId) {
+					// TODO Persist playlist once CSRF fix is rolled out.
 					Log.i(TAG, "Created playlist with id: " + playlistId);
 					mPlaylistId = playlistId;
 				}
@@ -250,85 +217,40 @@
 				}
 			});
 			
-			// TODO karni: save the playlist
+			// TODO This block will be removed soon, see TODO above.
+			Activity activity = getSherlockActivity();
+			final ContentResolver resolver = activity != null ? activity.getContentResolver() : null;
+			if (mPlaylistId != null && resolver != null) {
+				api.getPlaylists(new U1PlaylistListener() {
+					@Override
+					public void onSuccess(U1Playlist playlist) {
+						if (mPlaylistId.equals(playlist.getId())) {
+							new PlaylistDao().updateOrInsert(resolver, playlist);
+						}
+					}
+				});
+			}
+			
 			return mPlaylistId != null;
 		}
 
 		@Override
-		protected void onPostExecute(Boolean result) {
+		protected void onPostExecute(Boolean created) {
 			if (mDialogFragment != null && mDialogFragment.isAdded()) {
 				mDialogFragment.dismiss();
 			}
 			
 			SherlockFragmentActivity activity = getSherlockActivity();
-			boolean created = mPlaylistId != null;
 			if (created && activity != null) {
 				((HomeActivity) activity).forcePlaylistsRefresh();
 			} else if (!created  && activity != null && !TextUtils.isEmpty(mErrorMessage)) {
-				DialogFragment frag = InfoAlertDialog.newInstance(INFO_DIALOG_ID,
-						R.string.creating_playlist_failed_title, mErrorMessage);
+				DialogFragment frag = InfoAlertDialog.newInstance(ERROR_DIALOG_ID, 0, mErrorMessage);
 				frag.show(activity.getSupportFragmentManager(), null);
 			}
 		}
 	}
 	
-	private class AppendToPlaylistTask extends AsyncTask<Uri, Void, Boolean> {
-		private DialogFragment mDialogFragment;
-		private Boolean mUpdated = false;
-		private String mErrorMessage;
-		
-		@Override
-		protected void onPreExecute() {
-			SherlockFragmentActivity activity = getSherlockActivity();
-			if (activity != null) {
-				mDialogFragment = ModalAlertDialog.newInstance();
-				mDialogFragment.show(activity.getSupportFragmentManager(), "pleaseWaitDialog");
-			}
-		}
-
-		@Override
-		protected Boolean doInBackground(Uri... params) {
-			if (params.length != 1) {
-				throw new IllegalArgumentException(
-						"AppendToPlaylistTask takes two arguments, playlist uri and content uri");
-			}
-			final Uri playlistUri = params[0];
-			final Uri contentUri = params[1];
-			
-			Activity activity = getSherlockActivity();
-			ContentResolver resolver = activity != null ? activity.getContentResolver() : null;
-			if (resolver == null) return mUpdated;
-			
-			String mimeType = resolver.getType(contentUri);
-			if (mimeType.equals(Artists.CONTENT_ITEM_TYPE)) {
-				MusicProviderUtils.enqueueArtist(activity, contentUri, playlistUri);
-			} else if (mimeType.equals(Albums.CONTENT_ITEM_TYPE)) {
-				MusicProviderUtils.enqueueAlbum(activity, contentUri, playlistUri);
-			} else if (mimeType.equals(Songs.CONTENT_ITEM_TYPE)) {
-				MusicProviderUtils.enqueueSong(activity, contentUri, playlistUri);
-			} else {
-				Log.e(TAG, "Unknown content uri to enqueue to playlist: " + contentUri.toString());
-			}
-			
-			U1MusicAPI api = UbuntuOneMusic.getInstance().getMusicApi();
-			// TODO save playlist to server
-			return mUpdated;
-		}
-
-		@Override
-		protected void onPostExecute(Boolean result) {
-			if (mDialogFragment != null && mDialogFragment.isAdded()) {
-				mDialogFragment.dismiss();
-			}
-			
-			SherlockFragmentActivity activity = getSherlockActivity();
-			if (mUpdated && activity != null) {
-				((HomeActivity) activity).forcePlaylistsRefresh();
-			} else if (!mUpdated && activity != null && !TextUtils.isEmpty(mErrorMessage)) {
-				DialogFragment frag = InfoAlertDialog.newInstance(INFO_DIALOG_ID,
-						R.string.creating_playlist_failed_title, mErrorMessage);
-				frag.show(activity.getSupportFragmentManager(), null);
-			}
-		}
+	public interface OnPlaylistSelectedListener {
+		public void onPlaylistSelected(Adapter adapter, int position, boolean hasHeaders);
 	}
 }

=== modified file 'src/com/ubuntuone/android/music/ui/SongsFragment.java'
--- src/com/ubuntuone/android/music/ui/SongsFragment.java	2012-11-08 14:14:54 +0000
+++ src/com/ubuntuone/android/music/ui/SongsFragment.java	2012-11-28 17:49:20 +0000
@@ -26,7 +26,9 @@
 import static com.ubuntuone.android.music.ui.PlaylistActivity.EXTRA_PLAYLIST_ID;
 import static com.ubuntuone.android.music.util.LogUtils.makeLogTag;
 import android.app.Activity;
+import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
@@ -49,9 +51,11 @@
 import com.ubuntuone.android.music.adapter.U1SongAdapter;
 import com.ubuntuone.android.music.provider.MusicContract.Albums;
 import com.ubuntuone.android.music.provider.MusicContract.Genres;
+import com.ubuntuone.android.music.provider.MusicContract.PlaylistSongs;
 import com.ubuntuone.android.music.provider.MusicContract.Playlists;
 import com.ubuntuone.android.music.provider.MusicContract.Songs;
 import com.ubuntuone.android.music.provider.MusicProviderUtils;
+import com.ubuntuone.android.music.service.SyncService;
 import com.ubuntuone.android.music.util.UIUtils;
 
 public class SongsFragment extends LoadingFragment<U1SongAdapter> implements OnClickListener
@@ -129,28 +133,28 @@
 		if (mAlbumId != null) {
 			Uri albumSongsUri = Albums.buildSongsUri(mAlbumId);
 			loader = new CursorLoader(getSherlockActivity(), albumSongsUri,
-					Songs.DEFAULT_PROJECTION, null, null, Songs.DEFAULT_SORT);
+					Songs.getDefaultProjection(), null, null, Albums.DEFAULT_SONG_SORT);
 		} else if (mPlaylistId != null) {
 			if (mPlaylistId.equals(MusicProviderUtils.STARRED_ID)) {
 				loader = new CursorLoader(getSherlockActivity(), Songs.STARRED_SONGS_URI,
-						Songs.DEFAULT_PROJECTION, null, null, Songs.DEFAULT_SORT);
+						Songs.getDefaultProjection(), null, null, Songs.DEFAULT_SORT);
 				loader.onContentChanged();
 			} else if (mPlaylistId.equals(MusicProviderUtils.CACHED_ID)) {
 				loader = new CursorLoader(getSherlockActivity(), Songs.CACHED_SONGS_URI,
-						Songs.DEFAULT_PROJECTION, null, null, Songs.DEFAULT_SORT);
+						Songs.getDefaultProjection(), null, null, Songs.DEFAULT_SORT);
 				loader.onContentChanged();
 			} else {
 				Uri playlistSongsUri = Playlists.buildPlaylistSongsUri(mPlaylistId);
 				loader = new CursorLoader(getSherlockActivity(), playlistSongsUri,
-						Songs.DEFAULT_PROJECTION, null, null, Songs.DEFAULT_SORT);
+						PlaylistSongs.DEFAULT_PROJECTION.clone(), null, null, PlaylistSongs.DEFAULT_SORT);
 			}
 		} else if (mGenreId != null) {
 			Uri genreSongsUri = Genres.buildGenreSongsUri(mGenreId);
 			loader = new CursorLoader(getSherlockActivity(), genreSongsUri,
-					Songs.DEFAULT_PROJECTION, null, null, Songs.DEFAULT_SORT);
+					Songs.getDefaultProjection(), null, null, Songs.DEFAULT_SORT);
 		} else {
 			loader = new CursorLoader(getSherlockActivity(), Songs.CONTENT_URI,
-					Songs.DEFAULT_PROJECTION, null, null, Songs.DEFAULT_SORT);
+					Songs.getDefaultProjection(), null, null, Songs.DEFAULT_SORT);
 		}
 		setIsLoading(true);
 		return loader;
@@ -189,15 +193,18 @@
 	@Override
 	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
 		if (v.getId() == android.R.id.list) {
-			menu.add(Menu.NONE, R.id.context_play, 0, R.string.description_play);
-			
-			menu.add(Menu.NONE, R.id.context_star, 0, R.string.description_star);
-			Activity activity = getSherlockActivity();
-			if (activity != null && UIUtils.isNetworkConnected(activity)) {
-				menu.add(Menu.NONE, R.id.context_add_to_playlist, 0,
-						R.string.description_add_to_playlist);
+			menu.add(Menu.NONE, R.id.context_play, 0,
+					R.string.description_play);
+			menu.add(Menu.NONE, R.id.context_star, 0,
+					R.string.description_star);
+			menu.add(Menu.NONE, R.id.context_add_to_playlist, 0,
+					R.string.description_add_to_playlist);
+			if (mPlaylistId != null) {
+				menu.add(Menu.NONE, R.id.context_remove_from_playlist, 0,
+						R.string.description_remove_from_playlist);
 			}
-			menu.add(Menu.NONE, R.id.context_add_to_queue, 0, R.string.description_add_to_queue);
+			menu.add(Menu.NONE, R.id.context_add_to_queue, 0,
+					R.string.description_add_to_queue);
 		} else {
 			super.onCreateContextMenu(menu, v, menuInfo);
 		}
@@ -216,6 +223,8 @@
 			return onStarContextItemSelected(position);
 		case R.id.context_add_to_playlist:
 			return onAddToPlaylistContextItemSelected(position);
+		case R.id.context_remove_from_playlist:
+			return onRemoveFromPlaylistContextItemSelected(position);
 		case R.id.context_add_to_queue:
 			return onAddToPlayQueueContextItemSelected(position);
 		default:
@@ -223,6 +232,12 @@
 		}
 	}
 	
+	private void forceReload() {
+		int loaderId = getLoaderId();
+		LoaderManager lm = getSherlockActivity().getSupportLoaderManager();
+		lm.getLoader(loaderId).forceLoad();
+	}
+	
 	private boolean onPlayContextItemSelected(int position) {
 		clearQueueAndPlay(mListView, position);
 		return true;
@@ -238,16 +253,41 @@
 				
 				MusicProviderUtils.toggleSongStarred(context, songUri);
 				
-				int loaderId = getLoaderId();
-				LoaderManager lm = getSherlockActivity().getSupportLoaderManager();
-				lm.getLoader(loaderId).forceLoad();
+				forceReload();
 			}
 		}
 		return true;
 	}
 	
 	private boolean onAddToPlaylistContextItemSelected(int position) {
-		// TODO
+		Cursor cursor = (Cursor) mListView.getItemAtPosition(position);
+		String songId = cursor.getString(cursor.getColumnIndex(Songs.SONG_ID));
+		Uri songUri = Songs.buildSongUri(songId);
+		
+		Intent intent = new Intent(getActivity(), PlaylistsActivity.class);
+		intent.putExtra(PlaylistsActivity.EXTRA_ENQUEUE_CONTENT_ID, songUri);
+		startActivity(intent);
+		return true;
+	}
+	
+	private boolean onRemoveFromPlaylistContextItemSelected(int position) {
+		Cursor cursor = (Cursor) mListView.getItemAtPosition(position);
+		String rowId = cursor.getString(cursor.getColumnIndex(Songs._ID));
+		
+		ContentResolver resolver = getActivity().getContentResolver();
+		String selection = Songs._ID + "=?";
+		String[] selectionArgs = new String[] { rowId };
+		resolver.delete(PlaylistSongs.CONTENT_URI, selection, selectionArgs);
+		
+		Activity activity = getActivity();
+		Uri playlistUri = Playlists.buildPlaylistUri(mPlaylistId);
+		MusicProviderUtils.flagPlaylistForSync(activity, playlistUri, true);
+		
+		forceReload();
+		if (activity != null && UIUtils.isNetworkConnected(activity)) {
+			Intent syncPlaylists = new Intent(SyncService.ACTION_SYNC_PLAYLISTS);
+			activity.startService(syncPlaylists);
+		}
 		return true;
 	}
 	

=== modified file 'src/com/ubuntuone/android/music/ui/dialog/InfoAlertDialog.java'
--- src/com/ubuntuone/android/music/ui/dialog/InfoAlertDialog.java	2012-11-08 14:14:54 +0000
+++ src/com/ubuntuone/android/music/ui/dialog/InfoAlertDialog.java	2012-11-28 17:49:20 +0000
@@ -28,6 +28,7 @@
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.view.Gravity;
+import android.view.ViewGroup.LayoutParams;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
@@ -41,7 +42,7 @@
 		InfoAlertDialog frag = new InfoAlertDialog();
 		Bundle args = new Bundle();
 		args.putInt("dialogId", dialogId);
-		args.putInt("titleId", titleId);
+		if (titleId != 0) args.putInt("titleId", titleId);
 		args.putString("message", message);
 		frag.setArguments(args);
 		return frag;
@@ -61,11 +62,12 @@
 	public Dialog onCreateDialog(Bundle savedInstanceState) {
 		Bundle args = getArguments();
 		final int dialogId = args.getInt("dialogId");
-		final int titleId = args.getInt("titleId");
 		final String message = args.getString("message");
 		
 		final TextView view = new TextView(getSherlockActivity());
+		view.setTextAppearance(getSherlockActivity(), android.R.style.TextAppearance_Large);
 		view.setGravity(Gravity.CENTER);
+		view.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,LayoutParams.WRAP_CONTENT));
 		view.setText(message);
 		
 		OnClickListener listener = new OnClickListener() {
@@ -79,11 +81,15 @@
 			}
 		};
 		
-		return new AlertDialog.Builder(getActivity())
-				.setTitle(titleId)
+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
 				.setView(view)
-				.setPositiveButton(R.string.ok, listener)
-				.create();
+				.setPositiveButton(R.string.ok, listener);
+		if (args.containsKey("titleId")) {
+			int titleId = args.getInt("titleId");
+			builder.setTitle(titleId);
+		}
+		
+		return builder.create();
 	}
 	
 	public static interface InfoAlertDialogListener {

=== modified file 'test/src/com/ubuntuone/android/music/provider/MusicProviderInsertTest.java'
--- test/src/com/ubuntuone/android/music/provider/MusicProviderInsertTest.java	2012-11-22 11:17:42 +0000
+++ test/src/com/ubuntuone/android/music/provider/MusicProviderInsertTest.java	2012-11-28 17:49:20 +0000
@@ -161,7 +161,7 @@
 		
 		assertNotNull("Inserted song uri is null.", uri);
 		
-		Cursor cursor = mResolver.query(uri, Songs.DEFAULT_PROJECTION, null, null, null);
+		Cursor cursor = mResolver.query(uri, Songs.getDefaultProjection(), null, null, null);
 		assertEquals("Wrong song row count returned.", 1, cursor.getCount());
 		assertTrue("Cursor missing rows.", cursor.moveToNext());
 		
@@ -218,7 +218,7 @@
 		
 		Uri uri = Songs.buildSongUri(song.getId());
 		
-		Cursor cursor = mResolver.query(uri, Songs.DEFAULT_PROJECTION, null, null, null);
+		Cursor cursor = mResolver.query(uri, Songs.getDefaultProjection(), null, null, null);
 		assertEquals("Wrong song row count returned.", 1, cursor.getCount());
 		assertTrue("Cursor missing rows.", cursor.moveToNext());
 		

=== modified file 'test/src/com/ubuntuone/android/music/provider/MusicProviderQueryTest.java'
--- test/src/com/ubuntuone/android/music/provider/MusicProviderQueryTest.java	2012-11-08 14:14:54 +0000
+++ test/src/com/ubuntuone/android/music/provider/MusicProviderQueryTest.java	2012-11-28 17:49:20 +0000
@@ -81,7 +81,7 @@
 	public void testQueryArtistSongs() {
 		Uri artistSongsUri = Artists.buildSongsUri(HashUtils.md5("artist1-artist_name"));
 		Cursor cursor = mResolver.query(artistSongsUri,
-				Songs.DEFAULT_PROJECTION, null, null, Songs.DEFAULT_SORT);
+				Songs.getDefaultProjection(), null, null, Songs.DEFAULT_SORT);
 		
 		assertEquals("Wrong artist songs count returned.", 2, cursor.getCount());
 		
@@ -141,7 +141,7 @@
 		Uri albumSongsUri = Albums.buildSongsUri(
 				HashUtils.md5("album1-album_titleartist1-artist_name"));
 		Cursor cursor = mResolver.query(albumSongsUri,
-				Songs.DEFAULT_PROJECTION, null, null, Songs.DEFAULT_SORT);
+				Songs.getDefaultProjection(), null, null, Songs.DEFAULT_SORT);
 		
 		assertEquals("Wrong album songs count returned.", 2, cursor.getCount());
 		
@@ -156,7 +156,7 @@
 	
 	public void testQuerySongs() {
 		Cursor cursor = mResolver.query(Songs.CONTENT_URI,
-				Songs.DEFAULT_PROJECTION, null, null, Songs.DEFAULT_SORT);
+				Songs.getDefaultProjection(), null, null, Songs.DEFAULT_SORT);
 		
 		assertEquals("Wrong song count returned.", MockData.SONGS_COUNT, cursor.getCount());
 		
@@ -173,7 +173,7 @@
 	public void testQuerySongsId() {
 		Uri songUri = Songs.buildSongUri("song1-song_id");
 		Cursor cursor = mResolver.query(songUri,
-				Songs.DEFAULT_PROJECTION, null, null, null);
+				Songs.getDefaultProjection(), null, null, null);
 		
 		assertEquals("Wrong songs count returned.",
 				1, cursor.getCount());

=== modified file 'test/src/com/ubuntuone/android/music/provider/MusicProviderUtilsTest.java'
--- test/src/com/ubuntuone/android/music/provider/MusicProviderUtilsTest.java	2012-11-13 13:58:31 +0000
+++ test/src/com/ubuntuone/android/music/provider/MusicProviderUtilsTest.java	2012-11-28 17:49:20 +0000
@@ -113,7 +113,7 @@
 	}
 	
 	public void testGetPlaylistSongCount() {
-		Uri playlistUri = Playlists.buildPlaylistSongsUri("playlist1-playlist_id");
+		Uri playlistUri = Playlists.buildPlaylistUri("playlist1-playlist_id");
 		int songCount = MusicProviderUtils.getPlaylistSongCount(mContext, playlistUri);
 		assertEquals("Wrong playlist song count.", 2, songCount);
 	}
@@ -181,7 +181,7 @@
 	}
 	
 	public void testEnqueueSongInPlaylist() {
-		Uri playlistUri = Playlists.buildPlaylistSongsUri("playlist2-playlist_id");
+		Uri playlistUri = Playlists.buildPlaylistUri("playlist2-playlist_id");
 		int songCount = MusicProviderUtils.getPlaylistSongCount(mContext, playlistUri);
 		assertEquals("Wrong song count of playlist.", 1, songCount);
 		
@@ -192,10 +192,11 @@
 		int newSongCount = MusicProviderUtils.getPlaylistSongCount(mContext, playlistUri);
 		assertEquals("Wrong new song count of playlist.", songCount + 1, newSongCount);
 		
+		Uri playlistSongsUri = Playlists.buildPlaylistSongsUri("playlist2-playlist_id");
 		Cursor cursor = null;
 		try {
 			String[] projection = new String[] { Songs.SONG_ID };
-			cursor = mResolver.query(playlistUri, projection,
+			cursor = mResolver.query(playlistSongsUri, projection,
 					null, null, PlaylistSongs.DEFAULT_SORT);
 			if (cursor != null && cursor.isBeforeFirst()) {
 				cursor.moveToLast();
@@ -232,7 +233,7 @@
 	}
 
 	public void testEnqueueAlbumInPlaylist() {
-		Uri playlistUri = Playlists.buildPlaylistSongsUri("playlist2-playlist_id");
+		Uri playlistUri = Playlists.buildPlaylistUri("playlist2-playlist_id");
 		int songCount = MusicProviderUtils.getPlaylistSongCount(mContext, playlistUri);
 		assertEquals("Wrong song count of playlist.", 1, songCount);
 		
@@ -244,10 +245,11 @@
 		int newSongCount = MusicProviderUtils.getPlaylistSongCount(mContext, playlistUri);
 		assertEquals("Wrong new song count of playlist.", songCount + albumSongCount, newSongCount);
 		
+		Uri playlistSongsUri = Playlists.buildPlaylistSongsUri("playlist2-playlist_id");
 		Cursor cursor = null;
 		try {
 			String[] projection = new String[] { Songs.SONG_ID };
-			cursor = mResolver.query(playlistUri, projection,
+			cursor = mResolver.query(playlistSongsUri, projection,
 					null, null, PlaylistSongs.DEFAULT_SORT);
 			if (cursor != null && cursor.isBeforeFirst()) {
 				cursor.moveToFirst();
@@ -298,7 +300,7 @@
 	}
 	
 	public void testEnqueueArtistInPlaylist() {
-		Uri playlistUri = Playlists.buildPlaylistSongsUri("playlist2-playlist_id");
+		Uri playlistUri = Playlists.buildPlaylistUri("playlist2-playlist_id");
 		int songCount = MusicProviderUtils.getPlaylistSongCount(mContext, playlistUri);
 		assertEquals("Wrong song count of playlist.", 1, songCount);
 		
@@ -311,10 +313,11 @@
 		int newSongCount = MusicProviderUtils.getPlaylistSongCount(mContext, playlistUri);
 		assertEquals("Wrong new song count of playlist.", songCount + artistSongCount, newSongCount);
 		
+		Uri playlistSongsUri = Playlists.buildPlaylistSongsUri("playlist2-playlist_id");
 		Cursor cursor = null;
 		try {
 			String[] projection = new String[] { Songs.SONG_ID };
-			cursor = mResolver.query(playlistUri, projection,
+			cursor = mResolver.query(playlistSongsUri, projection,
 					null, null, PlaylistSongs.DEFAULT_SORT);
 			if (cursor != null && cursor.isBeforeFirst()) {
 				cursor.moveToFirst();

=== modified file 'test/src/com/ubuntuone/android/music/ui/SongsPageTest.java'
--- test/src/com/ubuntuone/android/music/ui/SongsPageTest.java	2012-11-08 14:14:54 +0000
+++ test/src/com/ubuntuone/android/music/ui/SongsPageTest.java	2012-11-28 17:49:20 +0000
@@ -100,6 +100,8 @@
 		assertNotNull("PlayerActivity was not started",
 				mInstrumentation.checkMonitorHit(mPlayerActivityMonitor, 1));
 		activity.finish();
+		
+		mInstrumentation.waitForIdleSync();
 	}
 
 	public void testClearQueueAndPlaySongOnOnListItemClick() {
@@ -154,6 +156,8 @@
 		assertNotNull("PlayerActivity was not started",
 				mInstrumentation.checkMonitorHit(mPlayerActivityMonitor, 1));
 		activity.finish();
+		
+		mInstrumentation.waitForIdleSync();
 	}
 	
 	public void testOnStarContextItemSelected() {