From 395fbb400cf260ae51cc240e99d2b9080334d459 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Mon, 8 Sep 2014 17:20:27 -0700 Subject: Fix web commits for playNow passing on playlist suggestion --- .../daneren2005/dsub/fragments/SelectDirectoryFragment.java | 2 +- src/github/daneren2005/dsub/fragments/SubsonicFragment.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index 149e1cb5..0d9c2025 100644 --- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -358,7 +358,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter songs.add((MusicDirectory.Entry) it.next()); } - ssongs); + playNow(songs); return true; } diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java index 7628b687..8918baee 100644 --- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java +++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java @@ -1375,7 +1375,10 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR return gestureScanner; } - protected void playBookmark(final List songs, final Entry song) { + protected void playBookmark(List songs, Entry song) { + playBookmark(songs, song, null, null); + } + protected void playBookmark(final List songs, final Entry song, final String playlistName, final String playlistId) { final Integer position = song.getBookmark().getPosition(); AlertDialog.Builder builder = new AlertDialog.Builder(context); @@ -1444,12 +1447,12 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR playBookmark(entries, bookmark, playlistName, playlistId); } } - protected void playNow(List entries int position) { + protected void playNow(List entries, int position) { playNow(entries, position, null, null); } protected void playNow(List entries, int position, String playlistName, String playlistId) { Entry selected = entries.isEmpty() ? null : entries.get(0); - playNow(entries, selected, position, playlistName, playlistID); + playNow(entries, selected, position, playlistName, playlistId); } protected void playNow(List entries, Entry song, int position) { playNow(entries, song, position, null, null); -- cgit v1.2.3