From c6898aa3cc1b96bb8382101accc8ed1808f5a762 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sun, 19 Mar 2023 20:04:18 -0600
Subject: [PATCH] build: fix failure

Due to a sudden pivot to starting from repository backwards with
playlists, there were some half-baked changesets lying around that
I forgot to revert. Do that.
---
 CHANGELOG.md                                         |  1 +
 .../java/org/oxycblt/auxio/music/system/Indexer.kt   | 12 +++++-------
 .../auxio/playback/persist/PersistenceDatabase.kt    |  2 +-
 .../main/java/org/oxycblt/auxio/playlist/Playlist.kt |  1 -
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc55cf4cc..df765a896 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ rather than on start/stop
 - Fixed MP4-AAC files not playing due to an accidental audio extractor
 deletion
 - Fix "format" not appearing in song properties view
+- Fix visual bugs when editing duplicate songs in the queue
 
 ## 3.0.3
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt b/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
index 8928a059e..a5daf2118 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
@@ -144,11 +144,9 @@ interface Indexer {
          *
          * @param result The outcome of the music loading process.
          */
-        data class Complete(val result: Result<Response>) : State()
+        data class Complete(val result: Result<Library>) : State()
     }
 
-    data class Response(val result: Library, val playlists: List<Playlist>)
-
     /**
      * Represents the current progress of the music loader. Usually encapsulated in a [State].
      *
@@ -239,7 +237,7 @@ constructor(
     private val mediaStoreExtractor: MediaStoreExtractor,
     private val tagExtractor: TagExtractor
 ) : Indexer {
-    @Volatile private var lastResponse: Result<Indexer.Response>? = null
+    @Volatile private var lastResponse: Result<Library>? = null
     @Volatile private var indexingState: Indexer.Indexing? = null
     @Volatile private var controller: Indexer.Controller? = null
     @Volatile private var listener: Indexer.Listener? = null
@@ -339,7 +337,7 @@ constructor(
         context: Context,
         withCache: Boolean,
         scope: CoroutineScope
-    ): Indexer.Response {
+    ): Library {
         if (ContextCompat.checkSelfPermission(context, Indexer.PERMISSION_READ_AUDIO) ==
             PackageManager.PERMISSION_DENIED) {
             logE("Permission check failed")
@@ -397,7 +395,7 @@ constructor(
         if (cache == null || cache.invalidated) {
             cacheRepository.writeCache(rawSongs)
         }
-        return Indexer.Response(libraryJob.await(), listOf())
+        return libraryJob.await()
     }
 
     /**
@@ -428,7 +426,7 @@ constructor(
      * @param result The new [Result] to emit, representing the outcome of the music loading
      *   process.
      */
-    private suspend fun emitCompletion(result: Result<Indexer.Response>) {
+    private suspend fun emitCompletion(result: Result<Library>) {
         yield()
         // Swap to the Main thread so that downstream callbacks don't crash from being on
         // a background thread. Does not occur in emitIndexing due to efficiency reasons.
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceDatabase.kt b/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceDatabase.kt
index 3ac52c1fd..a61731213 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceDatabase.kt
@@ -40,7 +40,7 @@ import org.oxycblt.auxio.playback.state.RepeatMode
     entities = [PlaybackState::class, QueueHeapItem::class, QueueMappingItem::class],
     version = 27,
     exportSchema = false)
-@TypeConverters(Music.UID.Converter::class)
+@TypeConverters(PersistenceDatabase.Converters::class)
 abstract class PersistenceDatabase : RoomDatabase() {
     /**
      * Get the current [PlaybackStateDao].
diff --git a/app/src/main/java/org/oxycblt/auxio/playlist/Playlist.kt b/app/src/main/java/org/oxycblt/auxio/playlist/Playlist.kt
index d7e4d9303..62697fc8e 100644
--- a/app/src/main/java/org/oxycblt/auxio/playlist/Playlist.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playlist/Playlist.kt
@@ -26,4 +26,3 @@ interface Playlist {
     val name: String
     val songs: List<Song>
 }
-