From ca1831d23c22cdd327e47645eeb95f024d6debf7 Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Wed, 28 Jul 2021 13:55:05 +0200
Subject: [PATCH] Fix SubsonicPreferences creation

---
 .../adapter/PlayerNowPlayingSongAdapter.java     |  2 +-
 .../play/database/AppDatabase.java               |  3 +--
 .../play/subsonic/SubsonicPreferences.java       | 16 ++++++----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
index 2182304a..8f983d22 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
@@ -41,7 +41,7 @@ public class PlayerNowPlayingSongAdapter extends RecyclerView.Adapter<PlayerNowP
         Song song = songs.get(position);
 
         CustomGlideRequest.Builder
-                .from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.PRIMARY)
+                .from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)
                 .build()
                 .into(holder.cover);
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
index c76cd003..6f9d7db8 100644
--- a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
+++ b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
@@ -29,14 +29,13 @@ import com.cappielloantonio.play.model.Song;
 import com.cappielloantonio.play.model.SongArtistCross;
 import com.cappielloantonio.play.model.SongGenreCross;
 
-@Database(entities = {Album.class, Artist.class, Genre.class, Playlist.class, Song.class, RecentSearch.class, SongGenreCross.class, Queue.class, AlbumArtistCross.class, SongArtistCross.class, PlaylistSongCross.class}, version = 1, exportSchema = false)
+@Database(entities = {Album.class, Artist.class, Genre.class, Playlist.class, Song.class, RecentSearch.class, SongGenreCross.class, Queue.class, AlbumArtistCross.class, SongArtistCross.class, PlaylistSongCross.class}, version = 2, exportSchema = false)
 public abstract class AppDatabase extends RoomDatabase {
     private static final String TAG = "AppDatabase";
     private final static String DB_NAME = "play_db";
     private static AppDatabase instance;
 
     public static synchronized AppDatabase getInstance(Context context) {
-
         if (instance == null && context != null) {
             instance = Room.databaseBuilder(context, AppDatabase.class, DB_NAME)
                     .fallbackToDestructiveMigration()
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/SubsonicPreferences.java b/app/src/main/java/com/cappielloantonio/play/subsonic/SubsonicPreferences.java
index 7763a70a..faea3034 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/SubsonicPreferences.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/SubsonicPreferences.java
@@ -15,8 +15,7 @@ public class SubsonicPreferences {
         this.serverUrl = serverUrl;
         this.username = username;
         if(password != null) this.authentication = new SubsonicAuthentication(password);
-        if(token != null) this.authentication.setToken(token);
-        if(salt != null) this.authentication.setSalt(salt);
+        if(token != null && salt != null) this.authentication = new SubsonicAuthentication(token, salt);
     }
 
     public String getServerUrl() {
@@ -47,6 +46,11 @@ public class SubsonicPreferences {
             update(password);
         }
 
+        public SubsonicAuthentication(String token, String salt) {
+            this.token = token;
+            this.salt = salt;
+        }
+
         public String getSalt() {
             return salt;
         }
@@ -55,14 +59,6 @@ public class SubsonicPreferences {
             return token;
         }
 
-        public void setSalt(String salt) {
-            this.salt = salt;
-        }
-
-        public void setToken(String token) {
-            this.token = token;
-        }
-
         void update(String password) {
             this.salt = UUID.randomUUID().toString();
             this.token = StringUtil.tokenize(password + salt);