Remove unused activities

3 files changed, 0 insertions, 1363 deletions

diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
deleted file mode 100644
index 6432c385..00000000
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2009 (C) Sindre Mehus
- */
-package github.daneren2005.dsub.activity;
-
-import github.daneren2005.dsub.view.EntryAdapter;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.LayoutInflater;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.*;
-import com.actionbarsherlock.view.Menu;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.*;
-import github.daneren2005.dsub.util.*;
-import com.mobeta.android.dslv.*;
-import java.io.File;
-
-import java.util.*;
-
-public class SelectAlbumActivity extends SubsonicTabActivity {
-
-    private static final String TAG = SelectAlbumActivity.class.getSimpleName();
-
-    private DragSortListView entryList;
-    private View footer;
-    private View emptyView;
-	private boolean hideButtons = false;
-    private Button moreButton;
-    private Boolean licenseValid;
-	private boolean showHeader = true;
-	private EntryAdapter entryAdapter;
-	private List<MusicDirectory.Entry> entries;
-
-    /**
-     * Called when the activity is first created.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.select_album);
-
-        entryList = (DragSortListView) findViewById(R.id.select_album_entries);
-
-        footer = LayoutInflater.from(this).inflate(R.layout.select_album_footer, entryList, false);
-        entryList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-        entryList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if (position >= 0) {
-                    MusicDirectory.Entry entry = (MusicDirectory.Entry) parent.getItemAtPosition(position);
-                    if (entry.isDirectory()) {
-                        Intent intent = new Intent(SelectAlbumActivity.this, SelectAlbumActivity.class);
-                        intent.putExtra(Constants.INTENT_EXTRA_NAME_ID, entry.getId());
-                        intent.putExtra(Constants.INTENT_EXTRA_NAME_NAME, entry.getTitle());
-                        Util.startActivityWithoutTransition(SelectAlbumActivity.this, intent);
-                    } else if (entry.isVideo()) {
-						if(entryExists(entry)) {
-							playExternalPlayer(entry);
-						} else {
-							streamExternalPlayer(entry);
-						}
-                    }
-                }
-            }
-        });
-		entryList.setDropListener(new DragSortListView.DropListener() {
-			@Override
-			public void drop(int from, int to) {
-				int max = entries.size();
-				if(to >= max) {
-					to = max - 1;
-				}
-				else if(to < 0) {
-					to = 0;
-				}
-				entries.add(to, entries.remove(from));
-				entryAdapter.notifyDataSetChanged();
-			}
-		});
-		
-        moreButton = (Button) footer.findViewById(R.id.select_album_more);
-        emptyView = findViewById(R.id.select_album_empty);
-
-        registerForContextMenu(entryList);
-
-        String id = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ID);
-        String name = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_NAME);
-        String playlistId = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_ID);
-        String playlistName = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_NAME);
-        String albumListType = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE);
-        int albumListSize = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, 0);
-        int albumListOffset = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_OFFSET, 0);
-
-        if (playlistId != null) {
-            getPlaylist(playlistId, playlistName);
-        } else if (albumListType != null) {
-            getAlbumList(albumListType, albumListSize, albumListOffset);
-        } else {
-            getMusicDirectory(id, name);
-        }
-    }
-	
-	@Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        com.actionbarsherlock.view.MenuInflater inflater = getSupportMenuInflater();
-		if(licenseValid == null) {
-			inflater.inflate(R.menu.empty, menu);
-		}
-		else if(hideButtons) {
-			String albumListType = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE);
-			if(albumListType != null) {
-				inflater.inflate(R.menu.select_album_list, menu);
-			} else {
-				inflater.inflate(R.menu.select_album, menu);
-			}
-			hideButtons = false;
-		} else {
-			if(Util.isOffline(this)) {
-				inflater.inflate(R.menu.select_song_offline, menu);
-			}
-			else {
-				inflater.inflate(R.menu.select_song, menu);
-				
-				String playlistId = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_ID);
-				if(playlistId == null) {
-					menu.removeItem(R.id.menu_remove_playlist);
-				}
-			}
-		}
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
-		Intent intent;
-        switch (item.getItemId()) {
-			case R.id.menu_play_now:
-				playNow(false, false);
-				return true;
-			case R.id.menu_play_last:
-				playNow(false, true);
-				return true;
-			case R.id.menu_shuffle:
-				playNow(true, false);
-				return true;
-			case R.id.menu_select:
-				selectAllOrNone();
-				return true;
-			case R.id.menu_refresh:
-				refresh();
-				return true;
-			case R.id.menu_download:
-				downloadBackground(false);
-                selectAll(false, false);
-				return true;
-			case R.id.menu_cache:
-				downloadBackground(true);
-                selectAll(false, false);
-				return true;
-			case R.id.menu_delete:
-				delete();
-                selectAll(false, false);
-				return true;
-			case R.id.menu_add_playlist:
-				addToPlaylist(getSelectedSongs());
-				return true;
-			case R.id.menu_remove_playlist:
-				String playlistId = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_ID);
-				String playlistName = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_NAME);
-				removeFromPlaylist(playlistId, playlistName, getSelectedIndexes());
-				return true;
-            case R.id.menu_exit:
-                intent = new Intent(this, MainActivity.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                intent.putExtra(Constants.INTENT_EXTRA_NAME_EXIT, true);
-                Util.startActivityWithoutTransition(this, intent);
-                return true;
-            case R.id.menu_settings:
-                startActivity(new Intent(this, SettingsActivity.class));
-                return true;
-            case R.id.menu_help:
-                startActivity(new Intent(this, HelpActivity.class));
-                return true;
-        }
-
-        return false;
-    }
-
-	private void playNow(final boolean shuffle, final boolean append) {
-		if(getSelectedSongs().size() > 0) {
-			download(append, false, !append, false, shuffle);
-			selectAll(false, false);
-		}
-		else {
-			playAll(shuffle, append);
-		}
-	}
-    private void playAll(final boolean shuffle, final boolean append) {
-        boolean hasSubFolders = false;
-        for (int i = 0; i < entryList.getCount(); i++) {
-            MusicDirectory.Entry entry = (MusicDirectory.Entry) entryList.getItemAtPosition(i);
-            if (entry != null && entry.isDirectory()) {
-                hasSubFolders = true;
-                break;
-            }
-        }
-
-        String id = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ID);
-        if (hasSubFolders && id != null) {
-            downloadRecursively(id, false, append, !append, shuffle, false);
-        } else {
-            selectAll(true, false);
-            download(append, false, !append, false, shuffle);
-            selectAll(false, false);
-        }
-    }
-
-    private void refresh() {
-        finish();
-        Intent intent = getIntent();
-        intent.putExtra(Constants.INTENT_EXTRA_NAME_REFRESH, true);
-        Util.startActivityWithoutTransition(this, intent);
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu, view, menuInfo);
-        AdapterView.AdapterContextMenuInfo info =
-                (AdapterView.AdapterContextMenuInfo) menuInfo;
-
-        MusicDirectory.Entry entry = (MusicDirectory.Entry) entryList.getItemAtPosition(info.position);
-
-        if (entry.isDirectory()) {
-            MenuInflater inflater = getMenuInflater();
-			if(Util.isOffline(this))
-				inflater.inflate(R.menu.select_album_context_offline, menu);
-			else
-				inflater.inflate(R.menu.select_album_context, menu);
-        } else if(!entry.isVideo()) {
-            MenuInflater inflater = getMenuInflater();
-			if(Util.isOffline(this)) {
-				inflater.inflate(R.menu.select_song_context_offline, menu);
-			}
-			else {
-				inflater.inflate(R.menu.select_song_context, menu);
-				String playlistId = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_ID);
-				if(playlistId == null) {
-					menu.removeItem(R.id.song_menu_remove_playlist);
-				}
-			}
-        } else {
-			MenuInflater inflater = getMenuInflater();
-			if(Util.isOffline(this))
-				inflater.inflate(R.menu.select_video_context_offline, menu);
-			else
-				inflater.inflate(R.menu.select_video_context, menu);
-		}
-
-		if (!Util.isOffline(this) && !entry.isVideo()) {
-			menu.findItem(entry.isDirectory() ? R.id.album_menu_star : R.id.song_menu_star).setTitle(entry.isStarred() ? R.string.common_unstar : R.string.common_star);
-		}
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem menuItem) {
-        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
-        MusicDirectory.Entry entry = (MusicDirectory.Entry) entryList.getItemAtPosition(info.position);
-        List<MusicDirectory.Entry> songs = new ArrayList<MusicDirectory.Entry>(10);
-        songs.add((MusicDirectory.Entry) entryList.getItemAtPosition(info.position));
-        switch (menuItem.getItemId()) {
-            case R.id.album_menu_play_now:
-                downloadRecursively(entry.getId(), false, false, true, false, false);
-                break;
-			case R.id.album_menu_play_shuffled:
-                downloadRecursively(entry.getId(), false, false, true, true, false);
-                break;
-            case R.id.album_menu_play_last:
-                downloadRecursively(entry.getId(), false, true, false, false, false);
-                break;
-			case R.id.album_menu_download:
-                downloadRecursively(entry.getId(), false, true, false, false, true);
-                break;
-            case R.id.album_menu_pin:
-                downloadRecursively(entry.getId(), true, true, false, false, true);
-                break;
-			case R.id.album_menu_star:
-                toggleStarred(entry);
-                break;
-			case R.id.album_menu_delete:
-				deleteRecursively(entry);
-                break;
-            case R.id.song_menu_play_now:
-				getDownloadService().clear();
-                getDownloadService().download(songs, false, true, true, false);
-				Util.startActivityWithoutTransition(SelectAlbumActivity.this, DownloadActivity.class);
-                break;
-            case R.id.song_menu_play_next:
-                getDownloadService().download(songs, false, false, true, false);
-                break;
-            case R.id.song_menu_play_last:
-                getDownloadService().download(songs, false, false, false, false);
-                break;
-			case R.id.song_menu_download:
-				getDownloadService().downloadBackground(songs, false);
-                break;
-            case R.id.song_menu_pin:
-				getDownloadService().downloadBackground(songs, true);
-                break;
-			case R.id.song_menu_delete:
-				getDownloadService().delete(songs);
-                break;
-			case R.id.song_menu_add_playlist:
-				addToPlaylist(songs);
-                break;
-			case R.id.song_menu_star:
-                toggleStarred(entry);
-                break;
-			case R.id.song_menu_webview:
-				playWebView(entry);
-				break;
-			case R.id.song_menu_play_external:
-				playExternalPlayer(entry);
-				break;
-			case R.id.song_menu_info:
-				displaySongInfo(entry);
-				break;
-			case R.id.song_menu_stream_external:
-				streamExternalPlayer(entry);
-				break;
-			case R.id.song_menu_remove_playlist:
-				String playlistId = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_ID);
-				String playlistName = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_NAME);
-				removeFromPlaylist(playlistId, playlistName, Arrays.<Integer>asList(info.position - 1));
-				break;
-            default:
-                return super.onContextItemSelected(menuItem);
-        }
-        return true;
-    }
-
-    private void getMusicDirectory(final String id, final String name) {
-        setTitle(name);
-
-        new LoadTask() {
-            @Override
-            protected MusicDirectory load(MusicService service) throws Exception {
-                boolean refresh = getIntent().getBooleanExtra(Constants.INTENT_EXTRA_NAME_REFRESH, false);
-                return service.getMusicDirectory(id, name, refresh, SelectAlbumActivity.this, this);
-            }
-        }.execute();
-    }
-
-    private void getPlaylist(final String playlistId, final String playlistName) {
-        setTitle(playlistName);
-
-        new LoadTask() {
-            @Override
-            protected MusicDirectory load(MusicService service) throws Exception {
-                return service.getPlaylist(playlistId, playlistName, SelectAlbumActivity.this, this);
-            }
-        }.execute();
-    }
-
-    private void getAlbumList(final String albumListType, final int size, final int offset) {
-		showHeader = false;
-
-        if ("newest".equals(albumListType)) {
-            setTitle(R.string.main_albums_newest);
-        } else if ("random".equals(albumListType)) {
-            setTitle(R.string.main_albums_random);
-        } else if ("highest".equals(albumListType)) {
-            setTitle(R.string.main_albums_highest);
-        } else if ("recent".equals(albumListType)) {
-            setTitle(R.string.main_albums_recent);
-        } else if ("frequent".equals(albumListType)) {
-            setTitle(R.string.main_albums_frequent);
-        } else if ("starred".equals(albumListType)) {
-            setTitle(R.string.main_albums_starred);
-        }
-		
-		if (!"starred".equals(albumListType)) {
-			entryList.setDragEnabled(false);
-		}
-
-        new LoadTask() {
-            @Override
-            protected MusicDirectory load(MusicService service) throws Exception {
-            	MusicDirectory result;
-            	if ("starred".equals(albumListType)) {
-            		result = service.getStarredList(SelectAlbumActivity.this, this);
-            	} else {
-            		result = service.getAlbumList(albumListType, size, offset, SelectAlbumActivity.this, this);
-            	}
-                return result;
-            }
-
-            @Override
-            protected void done(Pair<MusicDirectory, Boolean> result) {
-                if (!result.getFirst().getChildren().isEmpty()) {
-					if (!("starred".equals(albumListType))) {
-						moreButton.setVisibility(View.VISIBLE);
-						entryList.addFooterView(footer);
-					}
-
-                    moreButton.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            Intent intent = new Intent(SelectAlbumActivity.this, SelectAlbumActivity.class);
-                            String type = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE);
-                            int size = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, 0);
-                            int offset = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_OFFSET, 0) + size;
-
-                            intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE, type);
-                            intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, size);
-                            intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_OFFSET, offset);
-                            Util.startActivityWithoutTransition(SelectAlbumActivity.this, intent);
-                        }
-                    });
-                }
-                super.done(result);
-            }
-        }.execute();
-    }
-
-    private void selectAllOrNone() {
-        boolean someUnselected = false;
-        int count = entryList.getCount();
-        for (int i = 0; i < count; i++) {
-            if (!entryList.isItemChecked(i) && entryList.getItemAtPosition(i) instanceof MusicDirectory.Entry) {
-                someUnselected = true;
-                break;
-            }
-        }
-        selectAll(someUnselected, true);
-    }
-
-    private void selectAll(boolean selected, boolean toast) {
-        int count = entryList.getCount();
-        int selectedCount = 0;
-        for (int i = 0; i < count; i++) {
-            MusicDirectory.Entry entry = (MusicDirectory.Entry) entryList.getItemAtPosition(i);
-            if (entry != null && !entry.isDirectory() && !entry.isVideo()) {
-                entryList.setItemChecked(i, selected);
-                selectedCount++;
-            }
-        }
-
-        // Display toast: N tracks selected / N tracks unselected
-        if (toast) {
-            int toastResId = selected ? R.string.select_album_n_selected
-                                      : R.string.select_album_n_unselected;
-            Util.toast(this, getString(toastResId, selectedCount));
-        }
-    }
-
-    private List<MusicDirectory.Entry> getSelectedSongs() {
-        List<MusicDirectory.Entry> songs = new ArrayList<MusicDirectory.Entry>(10);
-        int count = entryList.getCount();
-        for (int i = 0; i < count; i++) {
-            if (entryList.isItemChecked(i)) {
-                songs.add((MusicDirectory.Entry) entryList.getItemAtPosition(i));
-            }
-        }
-        return songs;
-    }
-	
-	private List<Integer> getSelectedIndexes() {
-		List<Integer> indexes = new ArrayList<Integer>();
-		
-		int count = entryList.getCount();
-        for (int i = 0; i < count; i++) {
-            if (entryList.isItemChecked(i)) {
-                indexes.add(i - 1);
-            }
-        }
-		
-		return indexes;
-	}
-
-    private void download(final boolean append, final boolean save, final boolean autoplay, final boolean playNext, final boolean shuffle) {
-        if (getDownloadService() == null) {
-            return;
-        }
-
-        final List<MusicDirectory.Entry> songs = getSelectedSongs();
-        Runnable onValid = new Runnable() {
-            @Override
-            public void run() {
-                if (!append) {
-                    getDownloadService().clear();
-                }
-
-                warnIfNetworkOrStorageUnavailable();
-                getDownloadService().download(songs, save, autoplay, playNext, shuffle);
-                String playlistName = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_NAME);
-                if (playlistName != null) {
-                    getDownloadService().setSuggestedPlaylistName(playlistName);
-                }
-                if (autoplay) {
-                    Util.startActivityWithoutTransition(SelectAlbumActivity.this, DownloadActivity.class);
-                } else if (save) {
-                    Util.toast(SelectAlbumActivity.this,
-                               getResources().getQuantityString(R.plurals.select_album_n_songs_downloading, songs.size(), songs.size()));
-                } else if (append) {
-                    Util.toast(SelectAlbumActivity.this,
-                               getResources().getQuantityString(R.plurals.select_album_n_songs_added, songs.size(), songs.size()));
-                }
-            }
-        };
-
-        checkLicenseAndTrialPeriod(onValid);
-    }
-	private void downloadBackground(final boolean save) {
-		List<MusicDirectory.Entry> songs = getSelectedSongs();
-		if(songs.isEmpty()) {
-			selectAll(true, false);
-			songs = getSelectedSongs();
-		}
-		downloadBackground(save, songs);
-	}
-	private void downloadBackground(final boolean save, final List<MusicDirectory.Entry> songs) {
-		if (getDownloadService() == null) {
-			return;
-		}
-
-		Runnable onValid = new Runnable() {
-			@Override
-			public void run() {
-				warnIfNetworkOrStorageUnavailable();
-				getDownloadService().downloadBackground(songs, save);
-
-				Util.toast(SelectAlbumActivity.this,
-					getResources().getQuantityString(R.plurals.select_album_n_songs_downloading, songs.size(), songs.size()));
-			}
-		};
-
-		checkLicenseAndTrialPeriod(onValid);
-	}
-
-    private void delete() {
-		List<MusicDirectory.Entry> songs = getSelectedSongs();
-		if(songs.isEmpty()) {
-			selectAll(true, false);
-			songs = getSelectedSongs();
-		}
-        if (getDownloadService() != null) {
-            getDownloadService().delete(songs);
-        }
-    }
-	
-	private boolean entryExists(MusicDirectory.Entry entry) {
-		DownloadFile check = new DownloadFile(this, entry, false);
-		return check.isCompleteFileAvailable();
-	}
-
-    private void playWebView(MusicDirectory.Entry entry) {
-		int maxBitrate = Util.getMaxVideoBitrate(this);
-		
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(Uri.parse(MusicServiceFactory.getMusicService(this).getVideoUrl(maxBitrate, this, entry.getId())));
-		
-        startActivity(intent);
-    }
-	private void playExternalPlayer(MusicDirectory.Entry entry) {
-		if(!entryExists(entry)) {
-			Util.toast(this, R.string.download_need_download);
-		} else {
-			Intent intent = new Intent(Intent.ACTION_VIEW);
-			intent.setDataAndType(Uri.parse(entry.getPath()), "video/*");
-			
-			List<ResolveInfo> intents = getPackageManager()
-				.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-			if(intents != null && intents.size() > 0) {
-				startActivity(intent);
-			}else {
-				Util.toast(this, R.string.download_no_streaming_player);
-			}
-		}
-	}
-	private void streamExternalPlayer(MusicDirectory.Entry entry) {
-		int maxBitrate = Util.getMaxVideoBitrate(this);
-		
-		Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setDataAndType(Uri.parse(MusicServiceFactory.getMusicService(this).getVideoStreamUrl(maxBitrate, this, entry.getId())), "video/*");
-		
-		List<ResolveInfo> intents = getPackageManager()
-			.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-		if(intents != null && intents.size() > 0) {
-			startActivity(intent);
-		} else {
-			Util.toast(this, R.string.download_no_streaming_player);
-		}
-	}
-	
-	public void deleteRecursively(MusicDirectory.Entry album) {
-		File dir = FileUtil.getAlbumDirectory(this, album);
-		Util.recursiveDelete(dir);
-		if(Util.isOffline(this)) {
-			refresh();
-		}
-	}
-
-    private void checkLicenseAndTrialPeriod(Runnable onValid) {
-        if (licenseValid) {
-            onValid.run();
-            return;
-        }
-
-        int trialDaysLeft = Util.getRemainingTrialDays(this);
-        Log.i(TAG, trialDaysLeft + " trial days left.");
-
-        if (trialDaysLeft == 0) {
-            showDonationDialog(trialDaysLeft, null);
-        } else if (trialDaysLeft < Constants.FREE_TRIAL_DAYS / 2) {
-            showDonationDialog(trialDaysLeft, onValid);
-        } else {
-            Util.toast(this, getResources().getString(R.string.select_album_not_licensed, trialDaysLeft));
-            onValid.run();
-        }
-    }
-
-    private void showDonationDialog(int trialDaysLeft, final Runnable onValid) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setIcon(android.R.drawable.ic_dialog_info);
-
-        if (trialDaysLeft == 0) {
-            builder.setTitle(R.string.select_album_donate_dialog_0_trial_days_left);
-        } else {
-            builder.setTitle(getResources().getQuantityString(R.plurals.select_album_donate_dialog_n_trial_days_left,
-                                                              trialDaysLeft, trialDaysLeft));
-        }
-
-        builder.setMessage(R.string.select_album_donate_dialog_message);
-
-        builder.setPositiveButton(R.string.select_album_donate_dialog_now,
-			new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialogInterface, int i) {
-					startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.DONATION_URL)));
-				}
-			});
-
-        builder.setNegativeButton(R.string.select_album_donate_dialog_later,
-			new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialogInterface, int i) {
-					dialogInterface.dismiss();
-					if (onValid != null) {
-						onValid.run();
-					}
-				}
-			});
-
-        builder.create().show();
-    }
-
-    private abstract class LoadTask extends TabActivityBackgroundTask<Pair<MusicDirectory, Boolean>> {
-
-        public LoadTask() {
-            super(SelectAlbumActivity.this);
-        }
-
-        protected abstract MusicDirectory load(MusicService service) throws Exception;
-
-        @Override
-        protected Pair<MusicDirectory, Boolean> doInBackground() throws Throwable {
-            MusicService musicService = MusicServiceFactory.getMusicService(SelectAlbumActivity.this);
-            MusicDirectory dir = load(musicService);
-            boolean valid = musicService.isLicenseValid(SelectAlbumActivity.this, this);
-            return new Pair<MusicDirectory, Boolean>(dir, valid);
-        }
-
-        @Override
-        protected void done(Pair<MusicDirectory, Boolean> result) {
-            entries = result.getFirst().getChildren();
-
-            int songCount = 0;
-            for (MusicDirectory.Entry entry : entries) {
-                if (!entry.isDirectory()) {
-                    songCount++;
-                }
-            }
-
-            if (songCount > 0) {
-				if(showHeader) {
-					entryList.addHeaderView(createHeader(entries), null, false);
-				}
-            } else {
-				hideButtons = true;
-			}
-
-            emptyView.setVisibility(entries.isEmpty() ? View.VISIBLE : View.GONE);
-            entryList.setAdapter(entryAdapter = new EntryAdapter(SelectAlbumActivity.this, getImageLoader(), entries, true));
-            licenseValid = result.getSecond();
-			invalidateOptionsMenu();
-
-            boolean playAll = getIntent().getBooleanExtra(Constants.INTENT_EXTRA_NAME_AUTOPLAY, false);
-            if (playAll && songCount > 0) {
-                playAll(getIntent().getBooleanExtra(Constants.INTENT_EXTRA_NAME_SHUFFLE, false), false);
-            }
-        }
-    }
-	
-	private View createHeader(List<MusicDirectory.Entry> entries) {
-        View header = LayoutInflater.from(this).inflate(R.layout.select_album_header, entryList, false);
-
-        View coverArtView = header.findViewById(R.id.select_album_art);
-        getImageLoader().loadImage(coverArtView, entries.get(0), true, true);
-
-        TextView titleView = (TextView) header.findViewById(R.id.select_album_title);
-        titleView.setText(getTitle());
-
-        int songCount = 0;
-
-        Set<String> artists = new HashSet<String>();
-        for (MusicDirectory.Entry entry : entries) {
-            if (!entry.isDirectory()) {
-                songCount++;
-                if (entry.getArtist() != null) {
-                    artists.add(entry.getArtist());
-                }
-            }
-        }
-
-        TextView artistView = (TextView) header.findViewById(R.id.select_album_artist);
-        if (artists.size() == 1) {
-            artistView.setText(artists.iterator().next());
-            artistView.setVisibility(View.VISIBLE);
-        } else {
-            artistView.setVisibility(View.GONE);
-        }
-
-        TextView songCountView = (TextView) header.findViewById(R.id.select_album_song_count);
-        String s = getResources().getQuantityString(R.plurals.select_album_n_songs, songCount, songCount);
-        songCountView.setText(s.toUpperCase());
-
-        return header;
-    }
-	
-	public void removeFromPlaylist(final String id, final String name, final List<Integer> indexes) {
-		/*new LoadingTask<Void>(this, true) {
-            @Override
-            protected Void doInBackground() throws Throwable {				
-                MusicService musicService = MusicServiceFactory.getMusicService(SelectAlbumActivity.this);
-				musicService.removeFromPlaylist(id, indexes, SelectAlbumActivity.this, null);
-                return null;
-            }
-            
-            @Override
-            protected void done(Void result) {
-				for(int i = indexes.size() - 1; i >= 0; i--) {
-					entryList.setItemChecked(indexes.get(i) + 1, false);
-					entryAdapter.removeAt(indexes.get(i));
-				}
-				entryAdapter.notifyDataSetChanged();
-                Util.toast(SelectAlbumActivity.this, getResources().getString(R.string.removed_playlist, indexes.size(), name));
-            }
-            
-            @Override
-            protected void error(Throwable error) {
-            	String msg;
-            	if (error instanceof OfflineException || error instanceof ServerTooOldException) {
-            		msg = getErrorMessage(error);
-            	} else {
-            		msg = getResources().getString(R.string.updated_playlist_error, name) + " " + getErrorMessage(error);
-            	}
-            	
-        		Util.toast(SelectAlbumActivity.this, msg, false);
-            }
-        }.execute();*/
-	}
-}
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectArtistActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectArtistActivity.java
deleted file mode 100644
index b439df15..00000000
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectArtistActivity.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2009 (C) Sindre Mehus
- */
-
-package github.daneren2005.dsub.activity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.ContextMenu;
-import android.view.LayoutInflater;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.TextView;
-import com.actionbarsherlock.view.Menu;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.Indexes;
-import github.daneren2005.dsub.domain.MusicFolder;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.view.ArtistAdapter;
-import github.daneren2005.dsub.util.BackgroundTask;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.TabActivityBackgroundTask;
-import github.daneren2005.dsub.util.Util;
-import java.io.File;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SelectArtistActivity extends SubsonicTabActivity implements AdapterView.OnItemClickListener {
-
-    private static final int MENU_GROUP_MUSIC_FOLDER = 10;
-
-    private ListView artistList;
-    private View folderButton;
-    private TextView folderName;
-    private List<MusicFolder> musicFolders;
-
-    /**
-     * Called when the activity is first created.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.select_artist);
-
-        artistList = (ListView) findViewById(R.id.select_artist_list);
-        artistList.setOnItemClickListener(this);
-
-        folderButton = LayoutInflater.from(this).inflate(R.layout.select_artist_header, artistList, false);
-        folderName = (TextView) folderButton.findViewById(R.id.select_artist_folder_2);
-
-        if (!Util.isOffline(this)) {
-            artistList.addHeaderView(folderButton);
-        }
-
-        registerForContextMenu(artistList);
-		setTitle(Util.isOffline(this) ? R.string.music_library_label_offline : R.string.music_library_label);
-
-        musicFolders = null;
-        load();
-    }
-	
-	@Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        com.actionbarsherlock.view.MenuInflater inflater = getSupportMenuInflater();
-        inflater.inflate(R.menu.select_artist, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
-		Intent intent;
-        switch (item.getItemId()) {
-			case R.id.menu_refresh:
-				refresh();
-				return true;
-			case R.id.menu_shuffle:
-				onShuffleRequested();
-				return true;
-            case R.id.menu_exit:
-                intent = new Intent(this, MainActivity.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                intent.putExtra(Constants.INTENT_EXTRA_NAME_EXIT, true);
-                Util.startActivityWithoutTransition(this, intent);
-                return true;
-            case R.id.menu_settings:
-                startActivity(new Intent(this, SettingsActivity.class));
-                return true;
-            case R.id.menu_help:
-                startActivity(new Intent(this, HelpActivity.class));
-                return true;
-			case R.id.menu_search:
-				onSearchRequested();
-				return true;
-        }
-
-        return false;
-    }
-
-    private void refresh() {
-        finish();
-        Intent intent = getIntent();
-        intent.putExtra(Constants.INTENT_EXTRA_NAME_REFRESH, true);
-        Util.startActivityWithoutTransition(this, intent);
-    }
-
-    private void selectFolder() {
-        folderButton.showContextMenu();
-    }
-	
-	public void deleteRecursively(Artist artist) {
-		File dir = FileUtil.getArtistDirectory(this, artist);
-		Util.recursiveDelete(dir);
-		if(Util.isOffline(this)) {
-			refresh();
-		}
-	}
-
-    private void load() {
-        BackgroundTask<Indexes> task = new TabActivityBackgroundTask<Indexes>(this) {
-            @Override
-            protected Indexes doInBackground() throws Throwable {
-                boolean refresh = getIntent().getBooleanExtra(Constants.INTENT_EXTRA_NAME_REFRESH, false);
-                MusicService musicService = MusicServiceFactory.getMusicService(SelectArtistActivity.this);
-                if (!Util.isOffline(SelectArtistActivity.this)) {
-                    musicFolders = musicService.getMusicFolders(refresh, SelectArtistActivity.this, this);
-                }
-                String musicFolderId = Util.getSelectedMusicFolderId(SelectArtistActivity.this);
-                return musicService.getIndexes(musicFolderId, refresh, SelectArtistActivity.this, this);
-            }
-
-            @Override
-            protected void done(Indexes result) {
-                List<Artist> artists = new ArrayList<Artist>(result.getShortcuts().size() + result.getArtists().size());
-                artists.addAll(result.getShortcuts());
-                artists.addAll(result.getArtists());
-                artistList.setAdapter(new ArtistAdapter(SelectArtistActivity.this, artists));
-
-                // Display selected music folder
-                if (musicFolders != null) {
-                    String musicFolderId = Util.getSelectedMusicFolderId(SelectArtistActivity.this);
-                    if (musicFolderId == null) {
-                        folderName.setText(R.string.select_artist_all_folders);
-                    } else {
-                        for (MusicFolder musicFolder : musicFolders) {
-                            if (musicFolder.getId().equals(musicFolderId)) {
-                                folderName.setText(musicFolder.getName());
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        };
-        task.execute();
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        if (view == folderButton) {
-            selectFolder();
-        } else {
-            Artist artist = (Artist) parent.getItemAtPosition(position);
-            Intent intent = new Intent(this, SelectAlbumActivity.class);
-            intent.putExtra(Constants.INTENT_EXTRA_NAME_ID, artist.getId());
-            intent.putExtra(Constants.INTENT_EXTRA_NAME_NAME, artist.getName());
-            Util.startActivityWithoutTransition(this, intent);
-        }
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu, view, menuInfo);
-
-        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
-
-        if (artistList.getItemAtPosition(info.position) instanceof Artist) {
-            MenuInflater inflater = getMenuInflater();
-			if(Util.isOffline(this))
-				inflater.inflate(R.menu.select_artist_context_offline, menu);
-			else
-				inflater.inflate(R.menu.select_artist_context, menu);
-        } else if (info.position == 0) {
-            String musicFolderId = Util.getSelectedMusicFolderId(this);
-            MenuItem menuItem = menu.add(MENU_GROUP_MUSIC_FOLDER, -1, 0, R.string.select_artist_all_folders);
-            if (musicFolderId == null) {
-                menuItem.setChecked(true);
-            }
-            if (musicFolders != null) {
-                for (int i = 0; i < musicFolders.size(); i++) {
-                    MusicFolder musicFolder = musicFolders.get(i);
-                    menuItem = menu.add(MENU_GROUP_MUSIC_FOLDER, i, i + 1, musicFolder.getName());
-                    if (musicFolder.getId().equals(musicFolderId)) {
-                        menuItem.setChecked(true);
-                    }
-                }
-            }
-            menu.setGroupCheckable(MENU_GROUP_MUSIC_FOLDER, true, true);
-        }
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem menuItem) {
-        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
-
-        Artist artist = (Artist) artistList.getItemAtPosition(info.position);
-
-        if (artist != null) {
-            switch (menuItem.getItemId()) {
-                case R.id.artist_menu_play_now:
-                    downloadRecursively(artist.getId(), false, false, true, false, false);
-                    break;
-				case R.id.artist_menu_play_shuffled:
-					downloadRecursively(artist.getId(), false, false, true, true, false);
-                    break;
-                case R.id.artist_menu_play_last:
-                    downloadRecursively(artist.getId(), false, true, false, false, false);
-                    break;
-				case R.id.artist_menu_download:
-                    downloadRecursively(artist.getId(), false, true, false, false, true);
-                    break;
-                case R.id.artist_menu_pin:
-                    downloadRecursively(artist.getId(), true, true, false, false, true);
-                    break;
-				case R.id.artist_menu_delete:
-                    deleteRecursively(artist);
-                    break;
-                default:
-                    return super.onContextItemSelected(menuItem);
-            }
-        } else if (info.position == 0) {
-            MusicFolder selectedFolder = menuItem.getItemId() == -1 ? null : musicFolders.get(menuItem.getItemId());
-            String musicFolderId = selectedFolder == null ? null : selectedFolder.getId();
-            String musicFolderName = selectedFolder == null ? getString(R.string.select_artist_all_folders)
-                                                            : selectedFolder.getName();
-            Util.setSelectedMusicFolderId(this, musicFolderId);
-            folderName.setText(musicFolderName);
-            refresh();
-        }
-
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java
deleted file mode 100644
index 7e6775ab..00000000
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2009 (C) Sindre Mehus
- */
-
-package github.daneren2005.dsub.activity;
-
-import github.daneren2005.dsub.view.PlaylistAdapter;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-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;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.OfflineException;
-import github.daneren2005.dsub.service.ServerTooOldException;
-import github.daneren2005.dsub.util.*;
-
-import java.util.List;
-
-public class SelectPlaylistActivity extends SubsonicTabActivity implements AdapterView.OnItemClickListener {
-    private ListView list;
-    private View emptyTextView;
-	private PlaylistAdapter playlistAdapter;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.select_playlist);
-
-        list = (ListView) findViewById(R.id.select_playlist_list);
-        emptyTextView = findViewById(R.id.select_playlist_empty);
-        list.setOnItemClickListener(this);
-        registerForContextMenu(list);
-
-        // Title: Playlists
-        setTitle(R.string.playlist_label);
-
-        load();
-    }
-	
-	@Override
-    public boolean onCreateOptionsMenu(com.actionbarsherlock.view.Menu menu) {
-        com.actionbarsherlock.view.MenuInflater inflater = getSupportMenuInflater();
-        inflater.inflate(R.menu.select_playlist, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
-		Intent intent;
-        switch (item.getItemId()) {
-			case R.id.menu_refresh:
-				refresh();
-				return true;
-            case R.id.menu_exit:
-                intent = new Intent(this, MainActivity.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                intent.putExtra(Constants.INTENT_EXTRA_NAME_EXIT, true);
-                Util.startActivityWithoutTransition(this, intent);
-                return true;
-            case R.id.menu_settings:
-                startActivity(new Intent(this, SettingsActivity.class));
-                return true;
-            case R.id.menu_help:
-                startActivity(new Intent(this, HelpActivity.class));
-                return true;
-			case R.id.menu_search:
-				onSearchRequested();
-				return true;
-        }
-
-        return false;
-    }
-
-	private void refresh() {
-		finish();
-		Intent intent = new Intent(this, SelectPlaylistActivity.class);
-		intent.putExtra(Constants.INTENT_EXTRA_NAME_REFRESH, true);
-		Util.startActivityWithoutTransition(this, intent);
-	}
-
-    private void load() {
-		final SelectPlaylistActivity me = this;
-        BackgroundTask<List<Playlist>> task = new TabActivityBackgroundTask<List<Playlist>>(this) {
-            @Override
-            protected List<Playlist> doInBackground() throws Throwable {
-                MusicService musicService = MusicServiceFactory.getMusicService(SelectPlaylistActivity.this);
-                boolean refresh = getIntent().getBooleanExtra(Constants.INTENT_EXTRA_NAME_REFRESH, false);
-                List<Playlist> playlists = musicService.getPlaylists(refresh, SelectPlaylistActivity.this, this);
-				if(!Util.isOffline(me))
-					new CacheCleaner(me, getDownloadService()).cleanPlaylists(playlists);
-				return playlists;
-            }
-
-            @Override
-            protected void done(List<Playlist> result) {
-                list.setAdapter(playlistAdapter = new PlaylistAdapter(SelectPlaylistActivity.this, result));
-                emptyTextView.setVisibility(result.isEmpty() ? View.VISIBLE : View.GONE);
-            }
-        };
-        task.execute();
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu, view, menuInfo);
-		
-		MenuInflater inflater = getMenuInflater();		
-		if (Util.isOffline(this))
-			inflater.inflate(R.menu.select_playlist_context_offline, menu);
-		else
-			inflater.inflate(R.menu.select_playlist_context, menu);
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem menuItem) {
-        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
-        Playlist playlist = (Playlist) list.getItemAtPosition(info.position);
-
-		Intent intent;
-        switch (menuItem.getItemId()) {
-			case R.id.playlist_menu_download:
-				downloadPlaylist(playlist.getId(), playlist.getName(), false, true, false, false, true);
-				break;
-			case R.id.playlist_menu_pin:
-				downloadPlaylist(playlist.getId(), playlist.getName(), true, true, false, false, true);
-				break;
-            case R.id.playlist_menu_play_now:
-                intent = new Intent(SelectPlaylistActivity.this, SelectAlbumActivity.class);
-                intent.putExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_ID, playlist.getId());
-                intent.putExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_NAME, playlist.getName());
-                intent.putExtra(Constants.INTENT_EXTRA_NAME_AUTOPLAY, true);
-                Util.startActivityWithoutTransition(SelectPlaylistActivity.this, intent);
-                break;
-			case R.id.playlist_menu_play_shuffled:
-				intent = new Intent(SelectPlaylistActivity.this, SelectAlbumActivity.class);
-                intent.putExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_ID, playlist.getId());
-                intent.putExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_NAME, playlist.getName());
-                intent.putExtra(Constants.INTENT_EXTRA_NAME_AUTOPLAY, true);
-				intent.putExtra(Constants.INTENT_EXTRA_NAME_SHUFFLE, true);
-                Util.startActivityWithoutTransition(SelectPlaylistActivity.this, intent);
-                break;
-			case R.id.playlist_menu_delete:
-				deletePlaylist(playlist);
-				break;
-			case R.id.playlist_info:
-				displayPlaylistInfo(playlist);
-				break;
-			case R.id.playlist_update_info:
-				updatePlaylistInfo(playlist);
-				break;
-            default:
-                return super.onContextItemSelected(menuItem);
-        }
-        return true;
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-
-        Playlist playlist = (Playlist) parent.getItemAtPosition(position);
-
-        Intent intent = new Intent(SelectPlaylistActivity.this, SelectAlbumActivity.class);
-        intent.putExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_ID, playlist.getId());
-        intent.putExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_NAME, playlist.getName());
-        Util.startActivityWithoutTransition(SelectPlaylistActivity.this, intent);
-    }
-
-	private void deletePlaylist(final Playlist playlist) {
-		new AlertDialog.Builder(this)
-        .setIcon(android.R.drawable.ic_dialog_alert)
-        .setTitle(R.string.common_confirm)
-        .setMessage(getResources().getString(R.string.delete_playlist, playlist.getName()))
-        .setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-				/*new LoadingTask<Void>(SelectPlaylistActivity.this, false) {
-					@Override
-					protected Void doInBackground() throws Throwable {
-						MusicService musicService = MusicServiceFactory.getMusicService(SelectPlaylistActivity.this);
-						musicService.deletePlaylist(playlist.getId(), SelectPlaylistActivity.this, null);
-						return null;
-					}
-
-					@Override
-					protected void done(Void result) {
-						playlistAdapter.remove(playlist);
-						playlistAdapter.notifyDataSetChanged();
-						Util.toast(SelectPlaylistActivity.this, getResources().getString(R.string.menu_deleted_playlist, playlist.getName()));
-					}
-
-					@Override
-					protected void error(Throwable error) {
-						String msg;
-						if (error instanceof OfflineException || error instanceof ServerTooOldException) {
-							msg = getErrorMessage(error);
-						} else {
-							msg = getResources().getString(R.string.menu_deleted_playlist_error, playlist.getName()) + " " + getErrorMessage(error);
-						}
-
-						Util.toast(SelectPlaylistActivity.this, msg, false);
-					}
-				}.execute();*/
-			}
-
-        })
-        .setNegativeButton(R.string.common_cancel, null)
-        .show();
-	}
-	
-	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(message)
-			.show();
-	}
-	
-	private void updatePlaylistInfo(final Playlist playlist) {
-		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)
-			.setTitle(R.string.playlist_update_info)
-			.setView(dialogView)
-			.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {					
-					/*new LoadingTask<Void>(SelectPlaylistActivity.this, false) {
-						@Override
-						protected Void doInBackground() throws Throwable {
-							MusicService musicService = MusicServiceFactory.getMusicService(SelectPlaylistActivity.this);
-							musicService.updatePlaylist(playlist.getId(), nameBox.getText().toString(), commentBox.getText().toString(), publicBox.isChecked(), SelectPlaylistActivity.this, null);
-							return null;
-						}
-
-						@Override
-						protected void done(Void result) {
-							refresh();
-							Util.toast(SelectPlaylistActivity.this, getResources().getString(R.string.playlist_updated_info, playlist.getName()));
-						}
-
-						@Override
-						protected void error(Throwable error) {
-							String msg;
-							if (error instanceof OfflineException || error instanceof ServerTooOldException) {
-								msg = getErrorMessage(error);
-							} else {
-								msg = getResources().getString(R.string.playlist_updated_info_error, playlist.getName()) + " " + getErrorMessage(error);
-							}
-
-							Util.toast(SelectPlaylistActivity.this, msg, false);
-						}
-					}.execute();*/
-				}
-
-			})
-			.setNegativeButton(R.string.common_cancel, null)
-			.show();
-	}
-}
\ No newline at end of file