From f4ae4645d4c6b38289e687e6c24cdde92799fda9 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Tue, 11 Aug 2020 04:51:07 +0900
Subject: [PATCH] apply sort method on new queries

---
 .../mainactivity/library/pager/AlbumsFragment.java          | 1 +
 .../mainactivity/library/pager/ArtistsFragment.java         | 6 +++---
 .../mainactivity/library/pager/GenresFragment.java          | 6 +++---
 .../mainactivity/library/pager/PlaylistsFragment.java       | 6 +++---
 .../fragments/mainactivity/library/pager/SongsFragment.java | 1 +
 .../main/java/com/dkanada/gramophone/util/QueryUtil.java    | 6 +++---
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
index ca9d2a45..478f438b 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
@@ -54,6 +54,7 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra
         query.setStartIndex(getAdapter().getItemCount());
         query.setParentId(QueryUtil.currentLibrary.getId());
 
+        QueryUtil.applySortMethod(query, PreferenceUtil.getInstance(App.getInstance()).getAlbumSortMethod());
         return query;
     }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
index a4ba6505..4b368061 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
@@ -51,11 +51,11 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr
         ArtistsQuery query = new ArtistsQuery();
 
         query.setFields(new ItemFields[]{ItemFields.Genres});
-        query.setParentId(QueryUtil.currentLibrary.getId());
-        query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
-        query.setStartIndex(getAdapter().getItemCount());
         query.setUserId(App.getApiClient().getCurrentUserId());
         query.setRecursive(true);
+        query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
+        query.setStartIndex(getAdapter().getItemCount());
+        query.setParentId(QueryUtil.currentLibrary.getId());
 
         return query;
     }
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java
index e97cc416..287ae29d 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java
@@ -43,11 +43,11 @@ public class GenresFragment extends AbsLibraryPagerRecyclerViewFragment<GenreAda
     protected ItemsByNameQuery createQuery() {
         ItemsByNameQuery query = new ItemsByNameQuery();
 
-        query.setParentId(QueryUtil.currentLibrary.getId());
-        query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
         query.setUserId(App.getApiClient().getCurrentUserId());
-        query.setStartIndex(getAdapter().getItemCount());
         query.setRecursive(true);
+        query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
+        query.setStartIndex(getAdapter().getItemCount());
+        query.setParentId(QueryUtil.currentLibrary.getId());
 
         return query;
     }
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java
index 2e890b24..e38a09d0 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java
@@ -45,11 +45,11 @@ public class PlaylistsFragment extends AbsLibraryPagerRecyclerViewFragment<Playl
         ItemQuery query = new ItemQuery();
 
         query.setIncludeItemTypes(new String[]{"Playlist"});
-        query.setParentId(QueryUtil.currentLibrary.getId());
-        query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
-        query.setStartIndex(getAdapter().getItemCount());
         query.setUserId(App.getApiClient().getCurrentUserId());
         query.setRecursive(true);
+        query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
+        query.setStartIndex(getAdapter().getItemCount());
+        query.setParentId(QueryUtil.currentLibrary.getId());
 
         return query;
     }
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
index 33ed4d35..e07bd8f1 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
@@ -73,6 +73,7 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
         query.setStartIndex(getAdapter().getItemCount());
         query.setParentId(QueryUtil.currentLibrary.getId());
 
+        QueryUtil.applySortMethod(query, PreferenceUtil.getInstance(App.getInstance()).getAlbumSortMethod());
         return query;
     }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/util/QueryUtil.java b/app/src/main/java/com/dkanada/gramophone/util/QueryUtil.java
index 9fc77371..bc331f12 100644
--- a/app/src/main/java/com/dkanada/gramophone/util/QueryUtil.java
+++ b/app/src/main/java/com/dkanada/gramophone/util/QueryUtil.java
@@ -183,7 +183,7 @@ public class QueryUtil {
         });
     }
 
-    private static void applyProperties(ItemQuery query) {
+    public static void applyProperties(ItemQuery query) {
         query.setUserId(App.getApiClient().getCurrentUserId());
         query.setRecursive(true);
         if (query.getParentId() == null && query.getArtistIds().length == 0) {
@@ -194,7 +194,7 @@ public class QueryUtil {
         if (query.getArtistIds().length == 0) query.setParentId(currentLibrary.getId());
     }
 
-    private static void applyProperties(ItemsByNameQuery query) {
+    public static void applyProperties(ItemsByNameQuery query) {
         query.setUserId(App.getApiClient().getCurrentUserId());
         query.setRecursive(true);
         if (query.getParentId() == null) {
@@ -205,7 +205,7 @@ public class QueryUtil {
         query.setParentId(currentLibrary.getId());
     }
 
-    private static void applySortMethod(ItemQuery query, String method) {
+    public static void applySortMethod(ItemQuery query, String method) {
         // album activity will always sort by track number
         if (query.getSortBy().length != 0) return;