From 480df8e99a441590c7b2c02f1ca79716863e4d58 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Mon, 6 Aug 2018 19:49:38 +0200 Subject: [PATCH] use setSong() callback in scrolling --- .../android/vanilla/ShowQueueFragment.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/ShowQueueFragment.java b/app/src/main/java/ch/blinkenlights/android/vanilla/ShowQueueFragment.java index 93558a43..a6868f7b 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/ShowQueueFragment.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/ShowQueueFragment.java @@ -228,8 +228,15 @@ public class ShowQueueFragment extends Fragment * its startup and is ready to be queried. */ public void setSong(long uptime, Song song) { - if (!mIsPopulated) { - onTimelineChanged(); + if (PlaybackService.hasInstance()) { + boolean scroll = PlaybackService + .getSettings(getActivity().getApplicationContext()) + .getBoolean(PrefKeys.QUEUE_ENABLE_SCROLL_TO_SONG, + PrefDefaults.QUEUE_ENABLE_SCROLL_TO_SONG); + + if (!mIsPopulated || scroll) { + refreshSongQueueList(scroll); + } } } @@ -238,11 +245,7 @@ public class ShowQueueFragment extends Fragment */ public void onTimelineChanged() { if (PlaybackService.hasInstance()) { - boolean shouldScroll = PlaybackService - .getSettings(getActivity().getApplicationContext()) - .getBoolean(PrefKeys.QUEUE_ENABLE_SCROLL_TO_SONG, - PrefDefaults.QUEUE_ENABLE_SCROLL_TO_SONG); - refreshSongQueueList(shouldScroll); + refreshSongQueueList(false); } }