From 8588f022a240e4fc0ff596be3fcc066d20ee60ee Mon Sep 17 00:00:00 2001
From: vfsfitvnm <vfsfitvnm@protonmail.com>
Date: Thu, 15 Sep 2022 20:00:44 +0200
Subject: [PATCH] Fix dynamic theme not being applied when restarting queue
 after being cleared

---
 .../kotlin/it/vfsfitvnm/vimusic/service/BitmapProvider.kt     | 4 +++-
 .../main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/BitmapProvider.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/BitmapProvider.kt
index 3f8e3e0..771d8c0 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/BitmapProvider.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/BitmapProvider.kt
@@ -16,7 +16,9 @@ class BitmapProvider(
     private val bitmapSize: Int,
     private val colorProvider: (isSystemInDarkMode: Boolean) -> Int
 ) {
-    private var lastUri: Uri? = null
+    var lastUri: Uri? = null
+        private set
+
     var lastBitmap: Bitmap? = null
     private var lastIsSystemInDarkMode = false
 
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt
index a2aecb1..5225fbe 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt
@@ -299,6 +299,8 @@ class PlayerService : InvincibleService(), Player.Listener, PlaybackStatsListene
 
         if (mediaItem == null) {
             bitmapProvider.listener?.invoke(null)
+        } else if (mediaItem.mediaMetadata.artworkUri == bitmapProvider.lastUri) {
+            bitmapProvider.listener?.invoke(bitmapProvider.lastBitmap)
         }
     }