From 9c45232c7584eadaadbf0f7dc89832c22a465426 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Thu, 7 Nov 2013 07:10:27 -0800 Subject: Move > size handling to DownloadService so it can cover all cases --- src/github/daneren2005/dsub/fragments/DownloadFragment.java | 8 ++------ src/github/daneren2005/dsub/service/DownloadServiceImpl.java | 9 +++++++-- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java index 5af030d3..50960834 100644 --- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java +++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java @@ -231,12 +231,8 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe new SilentBackgroundTask(context) { @Override protected Boolean doInBackground() throws Throwable { - if (getDownloadService().getCurrentPlayingIndex() < getDownloadService().size() - 1) { - getDownloadService().next(); - return true; - } else { - return false; - } + getDownloadService().next(); + return true; } @Override diff --git a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java index 731794de..d88b5262 100644 --- a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java +++ b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java @@ -770,8 +770,13 @@ public class DownloadServiceImpl extends Service implements DownloadService { @Override public synchronized void next() { int index = getCurrentPlayingIndex(); - if (index != -1) { - play(getNextPlayingIndex()); + int nextPlayingIndex = getNextPlayingIndex(); + // Make sure to actually go to next when repeat song is on + if(index == nextPlayingIndex) { + nextPlayingIndex++; + } + if (index != -1 && nextPlayingIndex < size()) { + play(nextPlayingIndex); } } -- cgit v1.2.3