From 487aa4627695c6c0ab69e68f749f6b3367b1505b Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sun, 30 Oct 2011 16:06:44 -0500
Subject: [PATCH] Confirm delete in playlist editor

---
 res/values/translatable.xml                 |  2 ++
 src/org/kreed/vanilla/PlaylistActivity.java | 29 ++++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/res/values/translatable.xml b/res/values/translatable.xml
index b84a1dff..b00e586a 100644
--- a/res/values/translatable.xml
+++ b/res/values/translatable.xml
@@ -45,6 +45,8 @@ THE SOFTWARE.
 	<string name="overwrite">Overwrite</string>
 	<string name="cancel">Cancel</string>
 
+	<string name="delete_playlist">Delete playlist %s?</string>
+
 	<!-- Library -->
 	<string name="enqueue">Enqueue</string>
 	<string name="play">Play</string>
diff --git a/src/org/kreed/vanilla/PlaylistActivity.java b/src/org/kreed/vanilla/PlaylistActivity.java
index 31442e22..04707c78 100644
--- a/src/org/kreed/vanilla/PlaylistActivity.java
+++ b/src/org/kreed/vanilla/PlaylistActivity.java
@@ -23,6 +23,8 @@
 package org.kreed.vanilla;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -40,12 +42,14 @@ import android.widget.Button;
 public class PlaylistActivity extends Activity
 	implements View.OnClickListener
 	         , AbsListView.OnItemClickListener
+	         , DialogInterface.OnClickListener
 {
 	private Looper mLooper;
 	private DragListView mListView;
 	private PlaylistAdapter mAdapter;
 
 	private long mPlaylistId;
+	private String mPlaylistName;
 	private boolean mEditing;
 
 	private Button mEditButton;
@@ -95,9 +99,11 @@ public class PlaylistActivity extends Activity
 	public void onNewIntent(Intent intent)
 	{
 		long id = intent.getLongExtra("playlist", 0);
+		String title = intent.getStringExtra("title");
 		mAdapter.setPlaylistId(id);
-		setTitle(intent.getStringExtra("title"));
+		setTitle(title);
 		mPlaylistId = id;
+		mPlaylistName = title;
 	}
 
 	/**
@@ -123,11 +129,16 @@ public class PlaylistActivity extends Activity
 		case R.id.edit:
 			setEditing(!mEditing);
 			break;
-		case R.id.delete:
-			Playlist.deletePlaylist(getContentResolver(), mPlaylistId);
-			finish();
+		case R.id.delete: {
+			AlertDialog.Builder builder = new AlertDialog.Builder(this);
+			String message = getResources().getString(R.string.delete_playlist, mPlaylistName);
+			builder.setMessage(message);
+			builder.setPositiveButton(R.string.delete, this);
+			builder.setNegativeButton(R.string.cancel, this);
+			builder.show();
 			break;
 		}
+		}
 	}
 
 	@Override
@@ -143,4 +154,14 @@ public class PlaylistActivity extends Activity
 			}
 		}
 	}
+
+	@Override
+	public void onClick(DialogInterface dialog, int which)
+	{
+		if (which == DialogInterface.BUTTON_POSITIVE) {
+			Playlist.deletePlaylist(getContentResolver(), mPlaylistId);
+			finish();
+		}
+		dialog.dismiss();
+	}
 }