From cb874bd02979c6dfa61363ac5020c7770eed0a36 Mon Sep 17 00:00:00 2001 From: Joshua Bahnsen Date: Fri, 17 May 2013 11:48:22 -0700 Subject: [PATCH] Fix Play Next --- AndroidManifest.xml | 4 ++-- .../androidapp/activity/SearchActivity.java | 8 ++++---- .../androidapp/activity/SelectAlbumActivity.java | 10 +++++----- .../androidapp/activity/SelectArtistActivity.java | 8 ++++---- .../activity/SelectPlaylistActivity.java | 2 +- .../androidapp/activity/SubsonicTabActivity.java | 14 +++++++------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a492a363..27323f78 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ + a:versionCode="20" + a:versionName="1.1.0.16" > diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java index 72d39168..8af8f0c8 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java @@ -190,16 +190,16 @@ public class SearchActivity extends SubsonicTabActivity { switch (menuItem.getItemId()) { case R.id.album_menu_play_now: - downloadRecursively(id, false, false, true, false, false); + downloadRecursively(id, false, false, true, false, false, false); break; case R.id.album_menu_play_next: - downloadRecursively(id, false, true, false, true, false); + downloadRecursively(id, false, true, false, true, false, true); break; case R.id.album_menu_play_last: - downloadRecursively(id, false, true, false, false, false); + downloadRecursively(id, false, true, false, false, false, false); break; case R.id.album_menu_pin: - downloadRecursively(id, true, true, false, false, false); + downloadRecursively(id, true, true, false, false, false, false); break; default: return super.onContextItemSelected(menuItem); diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java index 8dedfb49..237fe8da 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java @@ -260,7 +260,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity { String id = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ID); if (hasSubFolders && id != null) { - downloadRecursively(id, false, append, !append, shuffle, false); + downloadRecursively(id, false, append, !append, shuffle, false, false); } else { selectAll(true, false); download(append, false, !append, false, shuffle); @@ -296,16 +296,16 @@ public class SelectAlbumActivity extends SubsonicTabActivity { songs.add((MusicDirectory.Entry) albumListView.getItemAtPosition(info.position)); switch (menuItem.getItemId()) { case R.id.album_menu_play_now: - downloadRecursively(entry.getId(), false, false, true, false, false); + downloadRecursively(entry.getId(), false, false, true, false, false, false); break; case R.id.album_menu_play_next: - downloadRecursively(entry.getId(), false, false, true, true, false); + downloadRecursively(entry.getId(), false, false, true, true, false, true); break; case R.id.album_menu_play_last: - downloadRecursively(entry.getId(), false, true, false, false, false); + downloadRecursively(entry.getId(), false, true, false, false, false, false); break; case R.id.album_menu_pin: - downloadRecursively(entry.getId(), true, true, false, false, false); + downloadRecursively(entry.getId(), true, true, false, false, false, false); break; case R.id.select_album_play_all: playAll(); diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java index 3fb96973..56e7c692 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java @@ -214,16 +214,16 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter if (artist != null) { switch (menuItem.getItemId()) { case R.id.artist_menu_play_now: - downloadRecursively(artist.getId(), false, false, true, false, false); + downloadRecursively(artist.getId(), false, false, true, false, false, false); break; case R.id.artist_menu_play_next: - downloadRecursively(artist.getId(), false, false, true, true, false); + downloadRecursively(artist.getId(), false, false, true, true, false, true); break; case R.id.artist_menu_play_last: - downloadRecursively(artist.getId(), false, true, false, false, false); + downloadRecursively(artist.getId(), false, true, false, false, false, false); break; case R.id.artist_menu_pin: - downloadRecursively(artist.getId(), true, true, false, false, false); + downloadRecursively(artist.getId(), true, true, false, false, false, false); break; default: return super.onContextItemSelected(menuItem); diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java index 93e05e6f..c5d6fc79 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java @@ -143,7 +143,7 @@ public class SelectPlaylistActivity extends SubsonicTabActivity implements Adapt Intent intent; switch (menuItem.getItemId()) { case R.id.playlist_menu_pin: - downloadPlaylist(playlist.getId(), playlist.getName(), true, true, false, false, true); + downloadPlaylist(playlist.getId(), playlist.getName(), true, true, false, false, true, false); break; case R.id.playlist_menu_play_now: intent = new Intent(SelectPlaylistActivity.this, SelectAlbumActivity.class); diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java index da6521d1..6236c4db 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java @@ -418,13 +418,13 @@ public class SubsonicTabActivity extends Activity implements OnClickListener{ return IMAGE_LOADER; } - protected void downloadRecursively(final String id, final boolean save, final boolean append, final boolean autoplay, final boolean shuffle, final boolean background) { - downloadRecursively(id, "", true, save, append, autoplay, shuffle, background); + protected void downloadRecursively(final String id, final boolean save, final boolean append, final boolean autoplay, final boolean shuffle, final boolean background, final boolean playNext) { + downloadRecursively(id, "", true, save, append, autoplay, shuffle, background, playNext); } - protected void downloadPlaylist(final String id, final String name, final boolean save, final boolean append, final boolean autoplay, final boolean shuffle, final boolean background) { - downloadRecursively(id, name, false, save, append, autoplay, shuffle, background); + protected void downloadPlaylist(final String id, final String name, final boolean save, final boolean append, final boolean autoplay, final boolean shuffle, final boolean background, final boolean playNext) { + downloadRecursively(id, name, false, save, append, autoplay, shuffle, background, playNext); } - protected void downloadRecursively(final String id, final String name, final boolean isDirectory, final boolean save, final boolean append, final boolean autoplay, final boolean shuffle, final boolean background) { + protected void downloadRecursively(final String id, final String name, final boolean isDirectory, final boolean save, final boolean append, final boolean autoplay, final boolean shuffle, final boolean background, final boolean playNext) { ModalBackgroundTask> task = new ModalBackgroundTask>(this, false) { private static final int MAX_SONGS = 500; @@ -461,12 +461,12 @@ public class SubsonicTabActivity extends Activity implements OnClickListener{ protected void done(List songs) { DownloadService downloadService = getDownloadService(); if (!songs.isEmpty() && downloadService != null) { - if (!append) { + if (!append && !playNext) { downloadService.clear(); } warnIfNetworkOrStorageUnavailable(); if(!background) { - downloadService.download(songs, save, autoplay, false, shuffle); + downloadService.download(songs, save, autoplay, playNext, shuffle); if (!append && Util.getShouldTransitionOnPlaybackPreference(SubsonicTabActivity.this)) { Util.startActivityWithoutTransition(SubsonicTabActivity.this, DownloadActivity.class); }