From 90ecbe4b784223949d4fd17c8f60d0b149cb8e2b Mon Sep 17 00:00:00 2001
From: tzugen <tzugen@riseup.net>
Date: Tue, 1 Jun 2021 14:43:02 +0200
Subject: [PATCH] Make getCoverArt require a non-null entry

---
 .../org/moire/ultrasonic/service/CachedMusicService.kt      | 2 +-
 .../kotlin/org/moire/ultrasonic/service/MusicService.kt     | 2 +-
 .../org/moire/ultrasonic/service/OfflineMusicService.kt     | 2 +-
 .../kotlin/org/moire/ultrasonic/service/RESTMusicService.kt | 6 +-----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt
index 0f280258..7b70a191 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt
@@ -257,7 +257,7 @@ class CachedMusicService(private val musicService: MusicService) : MusicService,
 
     @Throws(Exception::class)
     override fun getCoverArt(
-        entry: MusicDirectory.Entry?,
+        entry: MusicDirectory.Entry,
         size: Int,
         saveToFile: Boolean,
         highQuality: Boolean
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt
index f4f88592..90f95f29 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt
@@ -113,7 +113,7 @@ interface MusicService {
 
     @Throws(Exception::class)
     fun getCoverArt(
-        entry: MusicDirectory.Entry?,
+        entry: MusicDirectory.Entry,
         size: Int,
         saveToFile: Boolean,
         highQuality: Boolean
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt
index f1fc7f43..e6eb6142 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt
@@ -133,7 +133,7 @@ class OfflineMusicService : MusicService, KoinComponent {
     }
 
     override fun getCoverArt(
-        entry: MusicDirectory.Entry?,
+        entry: MusicDirectory.Entry,
         size: Int,
         saveToFile: Boolean,
         highQuality: Boolean
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt
index fd9f2de6..f3968073 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt
@@ -490,17 +490,13 @@ open class RESTMusicService(
 
     @Throws(Exception::class)
     override fun getCoverArt(
-        entry: MusicDirectory.Entry?,
+        entry: MusicDirectory.Entry,
         size: Int,
         saveToFile: Boolean,
         highQuality: Boolean
     ): Bitmap? {
         // Synchronize on the entry so that we don't download concurrently for
         // the same song.
-        if (entry == null) {
-            return null
-        }
-
         synchronized(entry) {
             // Use cached file, if existing.
             var bitmap = FileUtil.getAlbumArtBitmap(entry, size, highQuality)