From a21a051cb5862198e56efe49497442297761630c Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Tue, 27 Jul 2021 17:23:14 +0200
Subject: [PATCH] Fix item image visualization

---
 .../play/adapter/AlbumHorizontalAdapter.java                 | 2 +-
 .../play/adapter/ArtistHorizontalAdapter.java                | 2 +-
 .../com/cappielloantonio/play/glide/CustomGlideRequest.java  | 5 +++++
 .../main/java/com/cappielloantonio/play/model/Artist.java    | 2 +-
 .../com/cappielloantonio/play/subsonic/models/AlbumID3.java  | 2 +-
 .../com/cappielloantonio/play/subsonic/models/ArtistID3.java | 3 ---
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java
index eb100ba0..ba3dbe17 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java
@@ -57,7 +57,7 @@ public class AlbumHorizontalAdapter extends RecyclerView.Adapter<AlbumHorizontal
         holder.albumArtist.setText(album.getArtistName());
 
         CustomGlideRequest.Builder
-                .from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.SONG_PIC)
+                .from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC)
                 .build()
                 .into(holder.cover);
     }
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 86c932c6..97dabe30 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
@@ -57,7 +57,7 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter<ArtistHorizont
         holder.artistInfo.setText("--");
 
         CustomGlideRequest.Builder
-                .from(context, artist.getPrimary(), artist.getPrimaryBlurHash(), CustomGlideRequest.SONG_PIC)
+                .from(context, artist.getPrimary(), artist.getPrimaryBlurHash(), CustomGlideRequest.ARTIST_PIC)
                 .build()
                 .into(holder.cover);
     }
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 ce619c5f..b2049cb7 100644
--- a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java
+++ b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.util.Log;
 
 import androidx.core.content.res.ResourcesCompat;
 
@@ -21,6 +22,8 @@ import com.wolt.blurhashkt.BlurHashDecoder;
 import java.util.Map;
 
 public class CustomGlideRequest {
+    private static final String TAG = "CustomGlideRequest";
+
     public static final String PRIMARY = "PRIMARY";
     public static final String BACKDROP = "BACKDROP";
 
@@ -55,6 +58,8 @@ public class CustomGlideRequest {
                 "&c=" + params.get("c") +
                 "&id=" + item;
 
+        Log.d(TAG, "--- createUrl() - " + sb);
+
         return sb;
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Artist.java b/app/src/main/java/com/cappielloantonio/play/model/Artist.java
index 2ab24686..3523781d 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Artist.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Artist.java
@@ -56,7 +56,7 @@ public class Artist implements Parcelable {
     public Artist(ArtistID3 artistID3) {
         this.id = artistID3.getId();
         this.name = artistID3.getName();
-        this.primary = artistID3.getCoverArtId();
+        this.primary = artistID3.getCoverArtId() != null ? artistID3.getCoverArtId() : artistID3.getId();
         this.backdrop = artistID3.getCoverArtId();
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.java b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.java
index 6a9b3c47..d6dbff03 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.java
@@ -17,7 +17,7 @@ public class AlbumID3 {
     protected String artist;
     @Attribute
     protected String artistId;
-    @Attribute
+    @Attribute(name = "coverArt")
     protected String coverArtId;
     @Attribute
     protected int songCount;
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.java b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.java
index 11115ed4..5779ec6d 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.java
@@ -39,18 +39,15 @@ public class ArtistID3 {
     public String getCoverArtId() {
         return coverArtId;
     }
-
     
     public void setCoverArtId(String value) {
         this.coverArtId = value;
     }
 
-    
     public int getAlbumCount() {
         return albumCount;
     }
 
-    
     public void setAlbumCount(int value) {
         this.albumCount = value;
     }