diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2014-01-22 21:52:13 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2014-01-22 21:52:13 -0800 |
| commit | 0fdfb4a7955b1c212fc9d03cfab22038526d8d5e (patch) | |
| tree | 8d47c4e5c42d668fb6bda02c9528785cf720795d /src/github/daneren2005/dsub/fragments | |
| parent | 77639dce292246a1a2cb76faad18a709d54d6fc3 (diff) | |
| parent | 8823b311386d51e840781196b987ffc4af69e578 (diff) | |
| download | dsub-0fdfb4a7955b1c212fc9d03cfab22038526d8d5e.tar.gz dsub-0fdfb4a7955b1c212fc9d03cfab22038526d8d5e.tar.bz2 dsub-0fdfb4a7955b1c212fc9d03cfab22038526d8d5e.zip | |
Merge
Diffstat (limited to 'src/github/daneren2005/dsub/fragments')
| -rw-r--r-- | src/github/daneren2005/dsub/fragments/DownloadFragment.java | 8 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java index f345334f..ea8e8c3c 100644 --- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java +++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java @@ -1281,11 +1281,9 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe // Right to Left swipe
if (e1.getX() - e2.getX() > swipeDistance && Math.abs(velocityX) > swipeVelocity) {
warnIfNetworkOrStorageUnavailable();
- if (downloadService.getCurrentPlayingIndex() < downloadService.size() - 1) {
- downloadService.next();
- onCurrentChanged();
- onProgressChanged();
- }
+ downloadService.next();
+ onCurrentChanged();
+ onProgressChanged();
return true;
}
diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index f88de757..4776295e 100644 --- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -506,6 +506,9 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter result = service.getStarredList(context, this);
} else if(("genres".equals(albumListType) && Util.checkServerVersion(context, "1.10.0")) || "years".equals(albumListType)) {
result = service.getAlbumList(albumListType, albumListExtra, size, 0, context, this);
+ if(result.getChildrenSize() == 0 && "genres".equals(albumListType)) {
+ result = service.getSongsByGenre(albumListExtra, size, 0, context, this);
+ }
} else if("genres".equals(albumListType)) {
result = service.getSongsByGenre(albumListExtra, size, 0, context, this);
} else {
|