Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #365 from lbonn/no-sort-special-collections 

Do not sort special collections
This commit is contained in:
Óscar García Amor 2020-12-29 16:48:13 +01:00 committed by GitHub
parent 5839c804b3 3c9dcbc0a3
commit 7d779315e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java
View File

@ -806,6 +806,11 @@ public class SelectAlbumActivity extends SubsonicTabActivity
new LoadTask()
{
@Override
protected boolean sortableCollection() {
return false;
}
@Override
protected MusicDirectory load(MusicService service) throws Exception
{
@ -882,6 +887,16 @@ public class SelectAlbumActivity extends SubsonicTabActivity
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
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 boolean sortableCollection() {
return true;
}
@Override
protected Pair<MusicDirectory, Boolean> doInBackground() throws Throwable
{
@ -1111,7 +1130,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity
MusicDirectory musicDirectory = result.getFirst();
List<MusicDirectory.Entry> entries = musicDirectory.getChildren();
if (Util.getShouldSortByDisc(SelectAlbumActivity.this))
if (sortableCollection() && Util.getShouldSortByDisc(SelectAlbumActivity.this))
{
Collections.sort(entries, new EntryByDiscAndTrackComparator());
}