From 4a167d3548ea6cb13f0efeb42c43f49e7795d9a9 Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Tue, 24 Apr 2018 00:12:29 -0400 Subject: [PATCH] Consolidate playNow usage --- .../nullsum/audinaut/fragments/SubsonicFragment.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/net/nullsum/audinaut/fragments/SubsonicFragment.java b/app/src/main/java/net/nullsum/audinaut/fragments/SubsonicFragment.java index 495e7e0..9a94e01 100644 --- a/app/src/main/java/net/nullsum/audinaut/fragments/SubsonicFragment.java +++ b/app/src/main/java/net/nullsum/audinaut/fragments/SubsonicFragment.java @@ -178,16 +178,16 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR refresh(); return true; case R.id.menu_play_now: - playNow(false, false); + playNow(false, false, false); return true; case R.id.menu_play_last: - playNow(false, true); + playNow(false, true, false); return true; case R.id.menu_play_next: playNow(false, true, true); return true; case R.id.menu_shuffle: - playNow(true, false); + playNow(true, false, false); return true; case R.id.menu_download: downloadBackground(false); @@ -1356,11 +1356,7 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR return getCurrentAdapter().getSelected(); } - private void playNow(final boolean shuffle, final boolean append) { - playNow(shuffle, append, false); - } - - void playNow(final boolean shuffle, final boolean append, final boolean playNext) { + void playNow(final boolean shuffle, final boolean append, final boolean playNext) { List songs = getSelectedEntries(); if (!songs.isEmpty()) { download(songs, append, !append, playNext, shuffle);