From 9f74fe8a209f599c4e2fec26541748ce9adae04e Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sat, 11 Feb 2023 16:39:46 -0700
Subject: [PATCH] image: add proper constructor to settings

Add proper @Inject constructors to ImageSettings.
---
 app/src/main/java/org/oxycblt/auxio/image/ImageModule.kt    | 3 ---
 app/src/main/java/org/oxycblt/auxio/image/ImageSettings.kt  | 4 +++-
 .../java/org/oxycblt/auxio/music/metadata/TagExtractor.kt   | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/image/ImageModule.kt b/app/src/main/java/org/oxycblt/auxio/image/ImageModule.kt
index 71728590a..cf8b04047 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/ImageModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/ImageModule.kt
@@ -17,12 +17,9 @@
  
 package org.oxycblt.auxio.image
 
-import android.content.Context
 import dagger.Binds
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 
 @Module
diff --git a/app/src/main/java/org/oxycblt/auxio/image/ImageSettings.kt b/app/src/main/java/org/oxycblt/auxio/image/ImageSettings.kt
index 09cf49fa4..14b49c627 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/ImageSettings.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/ImageSettings.kt
@@ -19,6 +19,8 @@ package org.oxycblt.auxio.image
 
 import android.content.Context
 import androidx.core.content.edit
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.settings.Settings
 import org.oxycblt.auxio.util.logD
@@ -45,7 +47,7 @@ interface ImageSettings : Settings<ImageSettings.Listener> {
     }
 }
 
-class ImageSettingsImpl(context: Context) :
+class ImageSettingsImpl @Inject constructor(@ApplicationContext context: Context) :
     Settings.Impl<ImageSettings.Listener>(context), ImageSettings {
     override val coverMode: CoverMode
         get() =
diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagExtractor.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagExtractor.kt
index 669175a83..640dd54f3 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagExtractor.kt
@@ -192,9 +192,9 @@ private class Task(context: Context, private val rawSong: RawSong) {
         textFrames["TXXX:musicbrainz album id"]?.let { rawSong.albumMusicBrainzId = it.first() }
         textFrames["TALB"]?.let { rawSong.albumName = it.first() }
         textFrames["TSOA"]?.let { rawSong.albumSortName = it.first() }
-        (textFrames["TXXX:musicbrainz album type"] ?: textFrames["TXXX:releasetype"] ?: textFrames["GRP1"])?.let {
-            rawSong.releaseTypes = it
-        }
+        (textFrames["TXXX:musicbrainz album type"]
+                ?: textFrames["TXXX:releasetype"] ?: textFrames["GRP1"])
+            ?.let { rawSong.releaseTypes = it }
 
         // Artist
         textFrames["TXXX:musicbrainz artist id"]?.let { rawSong.artistMusicBrainzIds = it }