Closes #92 Add public info/updating to playlists

9 files changed, 55 insertions, 12 deletions

diff --git a/subsonic-android/res/layout/update_playlist.xml b/subsonic-android/res/layout/update_playlist.xml
index 3d7e0fe2..7354ef5c 100644
--- a/subsonic-android/res/layout/update_playlist.xml
+++ b/subsonic-android/res/layout/update_playlist.xml
@@ -46,4 +46,25 @@
 			android:layout_marginLeft="4dp"
 			android:hint="@string/common.comment" />
 	</LinearLayout>
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/get_playlist_public_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/common.public" />
+		<CheckBox
+			android:id="@+id/get_playlist_public"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp"
+			android:checked="false"/>
+	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 9c9ac4b8..38c8a5c5 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -17,6 +17,7 @@
 	<string name="common.info">Details</string>

 	<string name="common.name">Name</string>

 	<string name="common.comment">Comment</string>

+	<string name="common.public">Public</string>

 	<string name="common.webview">Play Web View (Flash)</string>

 	<string name="common.play_external">Play External Player</string>

 	<string name="common.stream_external">Stream External Player</string>

diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java
index 90808a2e..d7deb610 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java
@@ -26,6 +26,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.*;
 import android.widget.AdapterView;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ListView;
 import github.daneren2005.dsub.R;
@@ -229,12 +230,15 @@ public class SelectPlaylistActivity extends SubsonicTabActivity implements Adapt
 	}
 	
 	private void displayPlaylistInfo(final Playlist playlist) {
+		String message = "Owner: " + playlist.getOwner() + "\nComments: " +
+			((playlist.getComment() == null) ? "" : playlist.getComment()) +
+			"\nSong Count: " + playlist.getSongCount() +
+			((playlist.getPublic() == null) ? "" : ("\nPublic: " + playlist.getPublic())) +
+			"\nCreation Date: " + playlist.getCreated().replace('T', ' ');
 		new AlertDialog.Builder(this)
 			.setIcon(android.R.drawable.ic_dialog_alert)
 			.setTitle(playlist.getName())
-			.setMessage("Owner: " + playlist.getOwner() + "\nComments: " +
-				((playlist.getComment() == null) ? "" : playlist.getComment()) +
-				"\nSong Count: " + playlist.getSongCount() + "\nCreation Date: " + playlist.getCreated().replace('T', ' '))
+			.setMessage(message)
 			.show();
 	}
 	
@@ -242,9 +246,16 @@ public class SelectPlaylistActivity extends SubsonicTabActivity implements Adapt
 		View dialogView = getLayoutInflater().inflate(R.layout.update_playlist, null);
 		final EditText nameBox = (EditText)dialogView.findViewById(R.id.get_playlist_name);
 		final EditText commentBox = (EditText)dialogView.findViewById(R.id.get_playlist_comment);
+		final CheckBox publicBox = (CheckBox)dialogView.findViewById(R.id.get_playlist_public);
 		
 		nameBox.setText(playlist.getName());
 		commentBox.setText(playlist.getComment());
+		Boolean pub = playlist.getPublic();
+		if(pub == null) {
+			publicBox.setEnabled(false);
+		} else {
+			publicBox.setChecked(pub);
+		}
 		
 		new AlertDialog.Builder(this)
 			.setIcon(android.R.drawable.ic_dialog_alert)
@@ -257,7 +268,7 @@ public class SelectPlaylistActivity extends SubsonicTabActivity implements Adapt
 						@Override
 						protected Void doInBackground() throws Throwable {
 							MusicService musicService = MusicServiceFactory.getMusicService(SelectPlaylistActivity.this);
-							musicService.updatePlaylist(playlist.getId(), nameBox.getText().toString(), commentBox.getText().toString(), SelectPlaylistActivity.this, null);
+							musicService.updatePlaylist(playlist.getId(), nameBox.getText().toString(), commentBox.getText().toString(), publicBox.isChecked(), SelectPlaylistActivity.this, null);
 							return null;
 						}
 
diff --git a/subsonic-android/src/github/daneren2005/dsub/domain/Playlist.java b/subsonic-android/src/github/daneren2005/dsub/domain/Playlist.java
index 14a068b8..c97659c7 100644
--- a/subsonic-android/src/github/daneren2005/dsub/domain/Playlist.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/Playlist.java
@@ -31,18 +31,20 @@ public class Playlist implements Serializable {
 	private String comment;
 	private String songCount;
 	private String created;
+	private Boolean pub;
 
     public Playlist(String id, String name) {
         this.id = id;
         this.name = name;
     }
-	public Playlist(String id, String name, String owner, String comment, String songCount, String created) {
+	public Playlist(String id, String name, String owner, String comment, String songCount, String created, String pub) {
         this.id = id;
         this.name = name;
 		this.owner = (owner == null) ? "" : owner;
 		this.comment = (comment == null) ? "" : comment;
 		this.songCount = (songCount == null) ? "" : songCount;
 		this.created = (created == null) ? "" : created;
+		this.pub = (pub == null) ? null : (pub.equals("true"));
     }
 
     public String getId() {
@@ -92,6 +94,13 @@ public class Playlist implements Serializable {
 	public void setCreated(String created) {
 		this.created = created;
 	}
+	
+	public Boolean getPublic() {
+		return this.pub;
+	}
+	public void setPublic(Boolean pub) {
+		this.pub = pub;
+	}
 
     @Override
     public String toString() {
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/CachedMusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/CachedMusicService.java
index 4028b029..fe9b6b45 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/CachedMusicService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/CachedMusicService.java
@@ -166,8 +166,8 @@ public class CachedMusicService implements MusicService {
 	}
 	
 	@Override
-	public void updatePlaylist(String id, String name, String comment, Context context, ProgressListener progressListener) throws Exception {
-		musicService.updatePlaylist(id, name, comment, context, progressListener);
+	public void updatePlaylist(String id, String name, String comment, boolean pub, Context context, ProgressListener progressListener) throws Exception {
+		musicService.updatePlaylist(id, name, comment, pub, context, progressListener);
 	}
 
     @Override
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/MusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/MusicService.java
index 702b4aa7..15075d02 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/MusicService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/MusicService.java
@@ -67,7 +67,7 @@ public interface MusicService {
 	
 	void removeFromPlaylist(String id, List<Integer> toRemove, Context context, ProgressListener progressListener) throws Exception;
 	
-	void updatePlaylist(String id, String name, String comment, Context context, ProgressListener progressListener) throws Exception;
+	void updatePlaylist(String id, String name, String comment, boolean pub, Context context, ProgressListener progressListener) throws Exception;
 
     Lyrics getLyrics(String artist, String title, Context context, ProgressListener progressListener) throws Exception;
 
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/OfflineMusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/OfflineMusicService.java
index 753f6016..5f643ccb 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/OfflineMusicService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/OfflineMusicService.java
@@ -317,7 +317,7 @@ public class OfflineMusicService extends RESTMusicService {
 	}
 	
 	@Override
-	public void updatePlaylist(String id, String name, String comment, Context context, ProgressListener progressListener) throws Exception {
+	public void updatePlaylist(String id, String name, String comment, boolean pub, Context context, ProgressListener progressListener) throws Exception {
 		throw new OfflineException("Updating playlist not available in offline mode");
 	}
 
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
index 627ad915..c7413b54 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
@@ -439,9 +439,9 @@ public class RESTMusicService implements MusicService {
 	}
 	
 	@Override
-	public void updatePlaylist(String id, String name, String comment, Context context, ProgressListener progressListener) throws Exception {
+	public void updatePlaylist(String id, String name, String comment, boolean pub, Context context, ProgressListener progressListener) throws Exception {
 		checkServerVersion(context, "1.8", "Updating playlists is not supported.");
-		Reader reader = getReader(context, progressListener, "updatePlaylist", null, Arrays.asList("playlistId", "name", "comment"), Arrays.<Object>asList(id, name, comment));
+		Reader reader = getReader(context, progressListener, "updatePlaylist", null, Arrays.asList("playlistId", "name", "comment", "public"), Arrays.<Object>asList(id, name, comment, pub));
 		try {
 			new ErrorParser(context).parse(reader);
 		} finally {
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/parser/PlaylistsParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/PlaylistsParser.java
index 7d6a587f..a5bf2497 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/parser/PlaylistsParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/PlaylistsParser.java
@@ -56,7 +56,8 @@ public class PlaylistsParser extends AbstractParser {
 					String comment = get("comment");
 					String songCount = get("songCount");
 					String created = get("created");
-                    result.add(new Playlist(id, name, owner, comment, songCount, created));
+					String pub = get("public");
+                    result.add(new Playlist(id, name, owner, comment, songCount, created, pub));
                 } else if ("error".equals(tag)) {
                     handleError();
                 }