From a1885e96cd9132168480f72a7e7ca9fadbcf3de1 Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Sun, 5 Dec 2021 16:16:21 +0100
Subject: [PATCH] Revert last commit

---
 .../play/adapter/ArtistCatalogueAdapter.java               | 4 ++--
 .../play/adapter/ArtistHorizontalAdapter.java              | 7 ++++---
 .../play/adapter/ArtistSimilarAdapter.java                 | 4 ++--
 .../cappielloantonio/play/glide/CustomGlideRequest.java    | 4 ++--
 .../play/ui/fragment/ArtistPageFragment.java               | 4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
index b7b347ad..e8b22bf8 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
@@ -90,8 +90,8 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
                 .from(
                         context,
                         artist.getId(),
-                        // CustomGlideRequest.ARTIST_PIC,
-                        artist.getImageUrl(),
+                        CustomGlideRequest.ARTIST_PIC,
+                        // artist.getImageUrl()
                         null
                 )
                 .build()
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
index 0845ceee..c8f97d42 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
@@ -58,9 +58,10 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter<ArtistHorizont
 
         CustomGlideRequest.Builder
                 .from(
-                        context, artist.getId(),
-                        // CustomGlideRequest.ARTIST_PIC,
-                        artist.getImageUrl(),
+                        context,
+                        artist.getId(),
+                        CustomGlideRequest.ARTIST_PIC,
+                        // artist.getImageUrl()
                         null
                 )
                 .build()
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java
index 3aa3911f..d0f5cacd 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java
@@ -52,8 +52,8 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter<ArtistSimilarAdap
                 .from(
                         context,
                         artist.getId(),
-                        // CustomGlideRequest.ARTIST_PIC,
-                        artist.getImageUrl(),
+                        CustomGlideRequest.ARTIST_PIC,
+                        // artist.getImageUrl()
                         null
                 )
                 .build()
diff --git a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java
index 2979838d..7a334e63 100644
--- a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java
+++ b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java
@@ -69,10 +69,10 @@ public class CustomGlideRequest {
 
             if (PreferenceUtil.getInstance(context).isDataSavingMode()) {
                 this.item = MusicUtil.getDefaultPicPerCategory(category);
-            } else if (item != null && !PreferenceUtil.getInstance(context).isDataSavingMode()) {
-                this.item = createUrl(item, PreferenceUtil.getInstance(context).getImageSize());
             } else if (custom != null && !PreferenceUtil.getInstance(context).isDataSavingMode()) {
                 this.item = custom;
+            } else if (item != null && !PreferenceUtil.getInstance(context).isDataSavingMode()) {
+                this.item = createUrl(item, PreferenceUtil.getInstance(context).getImageSize());
             } else {
                 this.item = MusicUtil.getDefaultPicPerCategory(category);
             }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
index f8226859..48c9dc7d 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
@@ -123,8 +123,8 @@ public class ArtistPageFragment extends Fragment {
                     .from(
                             requireContext(),
                             artistPageViewModel.getArtist().getId(),
-                            // CustomGlideRequest.ARTIST_PIC,
-                            artist.getImageUrl(),
+                            CustomGlideRequest.ARTIST_PIC,
+                            // artist.getImageUrl()
                             null
                     )
                     .build()