mirror of
https://gitlab.com/ultrasonic/ultrasonic.git
synced 2025-04-26 13:42:15 +03:00
Do not sort special collections
It does not make sense to sort: - random songs - recently added albums - recently played albums - most played albums - top rated albums - random albums As the order returned by the server is more relevant in these cases Signed-off-by: lbonn <bonnans.l@gmail.com>
This commit is contained in:
parent
0ce5a56051
commit
f43c107269
@ -806,6 +806,11 @@ public class SelectAlbumActivity extends SubsonicTabActivity
|
|||||||
|
|
||||||
new LoadTask()
|
new LoadTask()
|
||||||
{
|
{
|
||||||
|
@Override
|
||||||
|
protected boolean sortableCollection() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MusicDirectory load(MusicService service) throws Exception
|
protected MusicDirectory load(MusicService service) throws Exception
|
||||||
{
|
{
|
||||||
@ -882,6 +887,16 @@ public class SelectAlbumActivity extends SubsonicTabActivity
|
|||||||
|
|
||||||
new LoadTask()
|
new LoadTask()
|
||||||
{
|
{
|
||||||
|
@Override
|
||||||
|
protected boolean sortableCollection() {
|
||||||
|
if (albumListType.equals("newest") || albumListType.equals("random") ||
|
||||||
|
albumListType.equals("highest") || albumListType.equals("recent") ||
|
||||||
|
albumListType.equals("frequent")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MusicDirectory load(MusicService service) throws Exception
|
protected MusicDirectory load(MusicService service) throws Exception
|
||||||
{
|
{
|
||||||
@ -1096,6 +1111,10 @@ public class SelectAlbumActivity extends SubsonicTabActivity
|
|||||||
|
|
||||||
protected abstract MusicDirectory load(MusicService service) throws Exception;
|
protected abstract MusicDirectory load(MusicService service) throws Exception;
|
||||||
|
|
||||||
|
protected boolean sortableCollection() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Pair<MusicDirectory, Boolean> doInBackground() throws Throwable
|
protected Pair<MusicDirectory, Boolean> doInBackground() throws Throwable
|
||||||
{
|
{
|
||||||
@ -1111,7 +1130,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity
|
|||||||
MusicDirectory musicDirectory = result.getFirst();
|
MusicDirectory musicDirectory = result.getFirst();
|
||||||
List<MusicDirectory.Entry> entries = musicDirectory.getChildren();
|
List<MusicDirectory.Entry> entries = musicDirectory.getChildren();
|
||||||
|
|
||||||
if (Util.getShouldSortByDisc(SelectAlbumActivity.this))
|
if (sortableCollection() && Util.getShouldSortByDisc(SelectAlbumActivity.this))
|
||||||
{
|
{
|
||||||
Collections.sort(entries, new EntryByDiscAndTrackComparator());
|
Collections.sort(entries, new EntryByDiscAndTrackComparator());
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user