Fix disabling single navidrome server

Author: CraftWorksMC

app/src/main/java/com/craftworks/music/managers/NavidromeManager.kt

@@ -42,17 +42,19 @@ object NavidromeManager {
         saveServers()
     }
 
-    fun setCurrentServer(id: String) {
-        if (id in servers) {
-            currentServerId = id
-        } else {
-            throw IllegalArgumentException("Server with id $id not found")
-        }
+    fun setCurrentServer(id: String?) {
+//        if (id in servers) {
+//            currentServerId = id
+//        } else {
+//            throw IllegalArgumentException("Server with id $id not found")
+//        }
+
+        currentServerId = id
         saveServers()
     }
 
     fun checkActiveServers(): Boolean {
-        return servers.keys.isNotEmpty() || currentServerId != null
+        return servers.keys.isNotEmpty() && currentServerId != null
     }
 
     fun getAllServers(): List<NavidromeProvider> = servers.values.toList()

app/src/main/java/com/craftworks/music/providers/local/LocalProvider.kt

@@ -82,16 +82,16 @@ class LocalProvider private constructor() {
                     }
 
                     else -> {
-                        val idColumn: Int = cursor.getColumnIndexOrThrow(MediaStore.Audio.Media._ID)
-                        val albumColumn: Int = cursor.getColumnIndex(MediaStore.Audio.Media.ALBUM)
-                        val artistColumn: Int = cursor.getColumnIndex(MediaStore.Audio.Media.ARTIST)
+                        val idColumn: Int = cursor.getColumnIndexOrThrow(MediaStore.Audio.Albums._ID)
+                        val albumColumn: Int = cursor.getColumnIndex(MediaStore.Audio.Albums.ALBUM)
+                        val artistColumn: Int = cursor.getColumnIndex(MediaStore.Audio.Albums.ARTIST)
                         //val dateAddedColumn: Int = cursor.getColumnIndex(MediaStore.Audio.Media.DATE_ADDED)
                         //val yearColumn: Int = cursor.getColumnIndex(MediaStore.Audio.Media.YEAR)
 
                         do {
                             val thisId = cursor.getLongOrNull(idColumn) ?: 0
-                            val thisAlbum = cursor.getString(albumColumn)
-                            val thisArtist = cursor.getString(artistColumn)
+                            val thisAlbum = cursor.getStringOrNull(albumColumn) ?: "Unknown"
+                            val thisArtist = cursor.getStringOrNull(artistColumn) ?: "Unknown"
                             //val thisDateAdded = cursor.getString(dateAddedColumn)
                             //val thisYear = cursor.getInt(yearColumn)
 
@@ -169,7 +169,7 @@ class LocalProvider private constructor() {
                 else -> {
                     val idColumn: Int = cursor.getColumnIndexOrThrow(MediaStore.Audio.Media._ID)
                     val albumColumn: Int = cursor.getColumnIndex(MediaStore.Audio.Media.ALBUM)
-                    val artistColumn: Int = cursor.getColumnIndex(MediaStore.Audio.Media.ARTIST)
+                    val artistColumn: Int = cursor.getColumnIndex(MediaStore.Audio.Albums.ARTIST)
                     val artistIdColumn: Int = cursor.getColumnIndex(MediaStore.Audio.Albums.ARTIST_ID)
                     val yearColumn: Int = cursor.getColumnIndex(MediaStore.Audio.Media.YEAR)
 

app/src/main/java/com/craftworks/music/ui/elements/ProviderCard.kt

@@ -191,8 +191,12 @@ fun NavidromeProviderCard(server: NavidromeProvider = NavidromeProvider("0","htt
                     NavidromeManager.setCurrentServer(server.id)
                     GlobalViewModels.refreshAll()
                 }
+                else {
+                    NavidromeManager.setCurrentServer(null)
+                    GlobalViewModels.refreshAll()
+                }
                 // Update checked
-                checked = (server.id == NavidromeManager.getCurrentServer()?.id)
+                //checked = (server.id == NavidromeManager.getCurrentServer()?.id)
             }
         )
     }