From 5b5c8ea8b7734fcc3745724c6e50c42f086a52ec Mon Sep 17 00:00:00 2001
From: Nite <shunite@gmail.com>
Date: Tue, 30 Jun 2020 17:09:13 +0200
Subject: [PATCH] Fixed CI things

---
 .../kotlin/org/moire/ultrasonic/app/UApp.kt    |  8 +++++++-
 .../moire/ultrasonic/di/MediaPlayerModule.kt   | 18 ++++++++++++++----
 .../moire/ultrasonic/di/MusicServiceModule.kt  |  7 ++++---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt
index 8e08d51d..fe97c592 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt
@@ -2,7 +2,13 @@ package org.moire.ultrasonic.app
 
 import androidx.multidex.MultiDexApplication
 import org.koin.android.ext.android.startKoin
-import org.moire.ultrasonic.di.*
+import org.moire.ultrasonic.di.DiProperties
+import org.moire.ultrasonic.di.appPermanentStorage
+import org.moire.ultrasonic.di.baseNetworkModule
+import org.moire.ultrasonic.di.directoriesModule
+import org.moire.ultrasonic.di.featureFlagsModule
+import org.moire.ultrasonic.di.mediaPlayerModule
+import org.moire.ultrasonic.di.musicServiceModule
 
 class UApp : MultiDexApplication() {
     override fun onCreate() {
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MediaPlayerModule.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MediaPlayerModule.kt
index f0f529f3..c740f0b4 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MediaPlayerModule.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MediaPlayerModule.kt
@@ -2,11 +2,21 @@ package org.moire.ultrasonic.di
 
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module.module
-import org.moire.ultrasonic.service.*
+import org.moire.ultrasonic.service.DownloadQueueSerializer
+import org.moire.ultrasonic.service.Downloader
+import org.moire.ultrasonic.service.ExternalStorageMonitor
+import org.moire.ultrasonic.service.JukeboxMediaPlayer
+import org.moire.ultrasonic.service.LocalMediaPlayer
+import org.moire.ultrasonic.service.MediaPlayerController
+import org.moire.ultrasonic.service.MediaPlayerControllerImpl
+import org.moire.ultrasonic.service.MediaPlayerLifecycleSupport
 import org.moire.ultrasonic.util.ShufflePlayBuffer
 
 val mediaPlayerModule = module {
-    single<MediaPlayerController> { MediaPlayerControllerImpl(androidContext(), get(), get(), get(), get(), get()) }
+    single<MediaPlayerController> {
+        MediaPlayerControllerImpl(androidContext(), get(), get(), get(), get(), get())
+    }
+
     single { JukeboxMediaPlayer(androidContext(), get()) }
     single { MediaPlayerLifecycleSupport(androidContext(), get(), get(), get()) }
     single { DownloadQueueSerializer(androidContext()) }
@@ -15,6 +25,6 @@ val mediaPlayerModule = module {
     single { Downloader(androidContext(), get(), get(), get()) }
     single { LocalMediaPlayer(androidContext()) }
 
-    // TODO: Ideally this can be cleaned up when all circular references are removed.
+    // TODO Ideally this can be cleaned up when all circular references are removed.
     single { MediaPlayerControllerImpl(androidContext(), get(), get(), get(), get(), get()) }
-}
\ No newline at end of file
+}
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt
index 8fb7c282..193e34d9 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt
@@ -3,7 +3,6 @@ package org.moire.ultrasonic.di
 
 import android.content.SharedPreferences
 import android.util.Log
-import org.koin.android.ext.koin.androidContext
 import kotlin.math.abs
 import org.koin.dsl.module.module
 import org.moire.ultrasonic.BuildConfig
@@ -12,10 +11,12 @@ import org.moire.ultrasonic.api.subsonic.SubsonicAPIVersions
 import org.moire.ultrasonic.api.subsonic.SubsonicClientConfiguration
 import org.moire.ultrasonic.api.subsonic.di.subsonicApiModule
 import org.moire.ultrasonic.cache.PermanentFileStorage
-import org.moire.ultrasonic.service.*
+import org.moire.ultrasonic.service.CachedMusicService
+import org.moire.ultrasonic.service.MusicService
+import org.moire.ultrasonic.service.OfflineMusicService
+import org.moire.ultrasonic.service.RESTMusicService
 import org.moire.ultrasonic.subsonic.loader.image.SubsonicImageLoader
 import org.moire.ultrasonic.util.Constants
-import org.moire.ultrasonic.util.ShufflePlayBuffer
 
 internal const val MUSIC_SERVICE_CONTEXT = "CurrentMusicService"
 internal const val ONLINE_MUSIC_SERVICE = "OnlineMusicService"