From cef6295b0241d8b38ae0a8ff9beb3bdc629a3a13 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Wed, 6 May 2020 00:25:52 +0900
Subject: [PATCH] reduce api calls for album and artist information

---
 .../ui/activities/AlbumDetailActivity.java    | 20 ++++-------
 .../ui/activities/ArtistDetailActivity.java   | 36 ++++++++-----------
 2 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
index 9b85edb0..74de84ae 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@@ -105,23 +105,15 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
         setAlbum(album);
         loadAlbumCover();
 
-        QueryUtil.getAlbum(album.id, new MediaCallback() {
+        ItemQuery query = new ItemQuery();
+        query.setParentId(album.id);
+        query.setSortBy(new String[]{"IndexNumber"});
+
+        QueryUtil.getSongs(query, new MediaCallback() {
             @Override
             public void onLoadMedia(List<?> media) {
-                Album album = (Album) media.get(0);
+                album.songs = (List<Song>) media;
                 setAlbum(album);
-
-                ItemQuery query = new ItemQuery();
-                query.setParentId(album.id);
-                query.setSortBy(new String[]{"IndexNumber"});
-
-                QueryUtil.getSongs(query, new MediaCallback() {
-                    @Override
-                    public void onLoadMedia(List<?> media) {
-                        album.songs = (List<Song>) media;
-                        setAlbum(album);
-                    }
-                });
             }
         });
     }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
index fea0582a..a924b34f 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
@@ -123,31 +123,23 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
         setArtist(artist);
         loadArtistImage();
 
-        QueryUtil.getArtist(artist.id, new MediaCallback() {
+        ItemQuery albums = new ItemQuery();
+        albums.setArtistIds(new String[]{artist.id});
+        QueryUtil.getAlbums(albums, new MediaCallback() {
             @Override
             public void onLoadMedia(List<?> media) {
-                Artist artist = (Artist) media.get(0);
+                artist.albums = (List<Album>) media;
+                setArtist(artist);
+            }
+        });
 
-                ItemQuery query = new ItemQuery();
-                query.setArtistIds(new String[]{artist.id});
-
-                QueryUtil.getAlbums(query, new MediaCallback() {
-                    @Override
-                    public void onLoadMedia(List<?> media) {
-                        artist.albums = (List<Album>) media;
-                        setArtist(artist);
-                    }
-                });
-
-                ItemQuery querys = new ItemQuery();
-                querys.setArtistIds(new String[]{artist.id});
-                QueryUtil.getSongs(querys, new MediaCallback() {
-                    @Override
-                    public void onLoadMedia(List<?> media) {
-                        artist.songs = (List<Song>) media;
-                        setArtist(artist);
-                    }
-                });
+        ItemQuery songs = new ItemQuery();
+        songs.setArtistIds(new String[]{artist.id});
+        QueryUtil.getSongs(songs, new MediaCallback() {
+            @Override
+            public void onLoadMedia(List<?> media) {
+                artist.songs = (List<Song>) media;
+                setArtist(artist);
             }
         });
     }