From f8a0a42dd3a9c01ad927b61dd7fb457394e8dd02 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Mon, 26 Jun 2023 17:56:48 -0600
Subject: [PATCH] music: finalize duplicate tags fix

Officially finalize the fix for #484, at least I think.

Resolves #484.
---
 CHANGELOG.md                                                 | 1 +
 .../java/org/oxycblt/auxio/music/device/DeviceMusicImpl.kt   | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a3575b7f..219bd405b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 #### What's Improved
 - `album artists` and `(album)artists sort` are now recognized
+- Increased distinction from shuffle on/off icons
 
 #### What's Fixed
 - Fixed an issue where the queue sheet would not collapse when scrolling
diff --git a/app/src/main/java/org/oxycblt/auxio/music/device/DeviceMusicImpl.kt b/app/src/main/java/org/oxycblt/auxio/music/device/DeviceMusicImpl.kt
index 9654cb187..354f6520f 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/device/DeviceMusicImpl.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/device/DeviceMusicImpl.kt
@@ -39,7 +39,6 @@ import org.oxycblt.auxio.music.info.ReleaseType
 import org.oxycblt.auxio.music.metadata.parseId3GenreNames
 import org.oxycblt.auxio.music.metadata.parseMultiValue
 import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
-import org.oxycblt.auxio.util.logD
 import org.oxycblt.auxio.util.nonZeroOrNull
 import org.oxycblt.auxio.util.toUuidOrNull
 import org.oxycblt.auxio.util.unlikelyToBeNull
@@ -224,7 +223,7 @@ class SongImpl(private val rawSong: RawSong, musicSettings: MusicSettings) : Son
         }
 
         check(_genres.isNotEmpty()) { "Malformed song: No genres" }
-        check(_genres.size == rawGenres.size) { "Malformed song: Genre grouping mismatch"}
+        check(_genres.size == rawGenres.size) { "Malformed song: Genre grouping mismatch" }
         for (i in _genres.indices) {
             // Non-destructively reorder the linked genres so that they align with
             // the genre ordering within the song metadata.
@@ -342,7 +341,7 @@ class AlbumImpl(
     fun finalize(): Album {
         check(songs.isNotEmpty()) { "Malformed album: Empty" }
         check(_artists.isNotEmpty()) { "Malformed album: No artists" }
-        check(_artists.size == rawArtists.size) { "Malformed song: Artist grouping mismatch" }
+        check(_artists.size == rawArtists.size) { "Malformed album: Artist grouping mismatch" }
         for (i in _artists.indices) {
             // Non-destructively reorder the linked artists so that they align with
             // the artist ordering within the song metadata.