Merge branch 'develop' into 'feature/unified-rating'

# Conflicts:
#   ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt
#   ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaLibrarySessionCallback.kt
#   ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaItemConverter.kt

.editorconfig

@@ -0,0 +1,2 @@
+[*.{kt,kts}]
+ktlint_code_style = android_studio

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Album.kt

@@ -31,7 +31,7 @@ data class Album(
     override var genre: String? = null,
     override var starred: Boolean = false,
     override var path: String? = null,
-    override var closeness: Int = 0,
+    override var closeness: Int = 0
 ) : MusicDirectory.Child() {
     override var isDirectory = true
     override var isVideo = false

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt

@@ -13,10 +13,7 @@ class MusicDirectory : ArrayList<MusicDirectory.Child>() {
     var name: String? = null
 
     @JvmOverloads
-    fun getChildren(
+    fun getChildren(includeDirs: Boolean = true, includeFiles: Boolean = true): List<Child> {
-        includeDirs: Boolean = true,
-        includeFiles: Boolean = true
-    ): List<Child> {
         if (includeDirs && includeFiles) {
             return toList()
         }

core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt

@@ -8,7 +8,8 @@ import org.moire.ultrasonic.api.subsonic.rules.MockWebServerRule
  * Base class for integration tests for [SubsonicAPIClient] class.
  */
 abstract class SubsonicAPIClientTest {
-    @JvmField @Rule val mockWebServerRule = MockWebServerRule()
+    @JvmField @Rule
+    val mockWebServerRule = MockWebServerRule()
 
     protected lateinit var config: SubsonicClientConfiguration
     protected lateinit var client: SubsonicAPIClient

core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/BaseInterceptorTest.kt

@@ -11,7 +11,8 @@ import org.moire.ultrasonic.api.subsonic.rules.MockWebServerRule
  * Base class for testing [okhttp3.Interceptor] implementations.
  */
 abstract class BaseInterceptorTest {
-    @Rule @JvmField val mockWebServerRule = MockWebServerRule()
+    @Rule @JvmField
+    val mockWebServerRule = MockWebServerRule()
 
     lateinit var client: OkHttpClient
 

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/ApiVersionCheckWrapper.kt

@@ -92,7 +92,13 @@ internal class ApiVersionCheckWrapper(
         checkVersion(V1_4_0)
         checkParamVersion(musicFolderId, V1_12_0)
         return api.search2(
-            query, artistCount, artistOffset, albumCount, albumOffset, songCount, musicFolderId
+            query,
+            artistCount,
+            artistOffset,
+            albumCount,
+            albumOffset,
+            songCount,
+            musicFolderId
         )
     }
 
@@ -108,7 +114,13 @@ internal class ApiVersionCheckWrapper(
         checkVersion(V1_8_0)
         checkParamVersion(musicFolderId, V1_12_0)
         return api.search3(
-            query, artistCount, artistOffset, albumCount, albumOffset, songCount, musicFolderId
+            query,
+            artistCount,
+            artistOffset,
+            albumCount,
+            albumOffset,
+            songCount,
+            musicFolderId
         )
     }
 
@@ -228,7 +240,13 @@ internal class ApiVersionCheckWrapper(
         checkParamVersion(estimateContentLength, V1_8_0)
         checkParamVersion(converted, V1_14_0)
         return api.stream(
-            id, maxBitRate, format, timeOffset, videoSize, estimateContentLength, converted
+            id,
+            maxBitRate,
+            format,
+            timeOffset,
+            videoSize,
+            estimateContentLength,
+            converted
         )
     }
 
@@ -335,8 +353,9 @@ internal class ApiVersionCheckWrapper(
     private fun checkVersion(expectedVersion: SubsonicAPIVersions) {
         // If it is true, it is probably the first call with this server
         if (!isRealProtocolVersion) return
-        if (currentApiVersion < expectedVersion)
+        if (currentApiVersion < expectedVersion) {
             throw ApiNotSupportedException(currentApiVersion)
+        }
     }
 
     private fun checkParamVersion(param: Any?, expectedVersion: SubsonicAPIVersions) {

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIDefinition.kt

@@ -90,10 +90,7 @@ interface SubsonicAPIDefinition {
     ): Call<SubsonicResponse>
 
     @GET("setRating.view")
-    fun setRating(
+    fun setRating(@Query("id") id: String, @Query("rating") rating: Int): Call<SubsonicResponse>
-        @Query("id") id: String,
-        @Query("rating") rating: Int
-    ): Call<SubsonicResponse>
 
     @GET("getArtist.view")
     fun getArtist(@Query("id") id: String): Call<GetArtistResponse>
@@ -158,8 +155,7 @@ interface SubsonicAPIDefinition {
         @Query("public") public: Boolean? = null,
         @Query("songIdToAdd") songIdsToAdd: List<String>? = null,
         @Query("songIndexToRemove") songIndexesToRemove: List<Int>? = null
-    ):
+    ): Call<SubsonicResponse>
-        Call<SubsonicResponse>
 
     @GET("getPodcasts.view")
     fun getPodcasts(
@@ -227,10 +223,7 @@ interface SubsonicAPIDefinition {
 
     @Streaming
     @GET("getCoverArt.view")
-    fun getCoverArt(
+    fun getCoverArt(@Query("id") id: String, @Query("size") size: Long? = null): Call<ResponseBody>
-        @Query("id") id: String,
-        @Query("size") size: Long? = null
-    ): Call<ResponseBody>
 
     @Streaming
     @GET("stream.view")

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt

@@ -29,10 +29,12 @@ enum class SubsonicAPIVersions(val subsonicVersions: String, val restApiVersion:
     V1_13_0("5.3", "1.13.0"),
     V1_14_0("6.0", "1.14.0"),
     V1_15_0("6.1", "1.15.0"),
-    V1_16_0("6.1.2", "1.16.0");
+    V1_16_0("6.1.2", "1.16.0")
+    ;
 
     companion object {
-        @JvmStatic @Throws(IllegalArgumentException::class)
+        @JvmStatic
+        @Throws(IllegalArgumentException::class)
         fun getClosestKnownClientApiVersion(apiVersion: String): SubsonicAPIVersions {
             val versionComponents = apiVersion.split(".")
 
@@ -41,8 +43,11 @@ enum class SubsonicAPIVersions(val subsonicVersions: String, val restApiVersion:
             try {
                 val majorVersion = versionComponents[0].toInt()
                 val minorVersion = versionComponents[1].toInt()
-                val patchVersion = if (versionComponents.size > 2) versionComponents[2].toInt()
+                val patchVersion = if (versionComponents.size > 2) {
-                else 0
+                    versionComponents[2].toInt()
+                } else {
+                    0
+                }
 
                 when (majorVersion) {
                     1 -> when {

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/VersionAwareJacksonConverterFactory.kt

@@ -48,7 +48,10 @@ class VersionAwareJacksonConverterFactory(
         retrofit: Retrofit
     ): Converter<*, RequestBody>? {
         return jacksonConverterFactory?.requestBodyConverter(
-            type, parameterAnnotations, methodAnnotations, retrofit
+            type,
+            parameterAnnotations,
+            methodAnnotations,
+            retrofit
         )
     }
 
@@ -63,7 +66,7 @@ class VersionAwareJacksonConverterFactory(
         }
     }
 
-    class VersionAwareResponseBodyConverter<T> (
+    class VersionAwareResponseBodyConverter<T>(
         private val notifier: (SubsonicAPIVersions) -> Unit = {},
         private val adapter: ObjectReader
     ) : Converter<ResponseBody, T> {

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/RangeHeaderInterceptor.kt

@@ -6,6 +6,7 @@ import okhttp3.Interceptor.Chain
 import okhttp3.Response
 
 internal const val SOCKET_READ_TIMEOUT_DOWNLOAD = 30 * 1000
+
 // Allow 20 seconds extra timeout pear MB offset.
 internal const val TIMEOUT_MILLIS_PER_OFFSET_BYTE = 0.02
 

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/AlbumListType.kt

@@ -23,7 +23,8 @@ enum class AlbumListType(val typeName: String) {
     SORTED_BY_ARTIST("alphabeticalByArtist"),
     STARRED("starred"),
     BY_YEAR("byYear"),
-    BY_GENRE("byGenre");
+    BY_GENRE("byGenre")
+    ;
 
     override fun toString(): String {
         return typeName

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/JukeboxAction.kt

@@ -16,7 +16,8 @@ enum class JukeboxAction(val action: String) {
     CLEAR("clear"),
     REMOVE("remove"),
     SHUFFLE("shuffle"),
-    SET_GAIN("setGain");
+    SET_GAIN("setGain")
+    ;
 
     override fun toString(): String {
         return action

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/BookmarksResponse.kt

@@ -10,7 +10,8 @@ class BookmarksResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("bookmarks") private val bookmarksWrapper = BookmarkWrapper()
+    @JsonProperty("bookmarks")
+    private val bookmarksWrapper = BookmarkWrapper()
 
     val bookmarkList: List<Bookmark> get() = bookmarksWrapper.bookmarkList
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/ChatMessagesResponse.kt

@@ -10,7 +10,8 @@ class ChatMessagesResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("chatMessages") private val wrapper = ChatMessagesWrapper()
+    @JsonProperty("chatMessages")
+    private val wrapper = ChatMessagesWrapper()
 
     val chatMessages: List<ChatMessage> get() = wrapper.messagesList
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GenresResponse.kt

@@ -10,7 +10,8 @@ class GenresResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("genres") private val genresWrapper = GenresWrapper()
+    @JsonProperty("genres")
+    private val genresWrapper = GenresWrapper()
     val genresList: List<Genre> get() = genresWrapper.genresList
 }
 

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumList2Response.kt

@@ -11,7 +11,8 @@ class GetAlbumList2Response(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("albumList2") private val albumWrapper2 = AlbumWrapper2()
+    @JsonProperty("albumList2")
+    private val albumWrapper2 = AlbumWrapper2()
 
     val albumList: List<Album>
         get() = albumWrapper2.albumList

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumListResponse.kt

@@ -10,7 +10,8 @@ class GetAlbumListResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("albumList") private val albumWrapper = AlbumWrapper()
+    @JsonProperty("albumList")
+    private val albumWrapper = AlbumWrapper()
 
     val albumList: List<Album>
         get() = albumWrapper.albumList

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetPodcastsResponse.kt

@@ -10,7 +10,8 @@ class GetPodcastsResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("podcasts") private val channelsWrapper = PodcastChannelWrapper()
+    @JsonProperty("podcasts")
+    private val channelsWrapper = PodcastChannelWrapper()
 
     val podcastChannels: List<PodcastChannel>
         get() = channelsWrapper.channelsList

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetRandomSongsResponse.kt

@@ -10,7 +10,8 @@ class GetRandomSongsResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("randomSongs") private val songsWrapper = RandomSongsWrapper()
+    @JsonProperty("randomSongs")
+    private val songsWrapper = RandomSongsWrapper()
 
     val songsList
         get() = songsWrapper.songsList

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetSongsByGenreResponse.kt

@@ -10,7 +10,8 @@ class GetSongsByGenreResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("songsByGenre") private val songsByGenreList = SongsByGenreWrapper()
+    @JsonProperty("songsByGenre")
+    private val songsByGenreList = SongsByGenreWrapper()
 
     val songsList get() = songsByGenreList.songsList
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/JukeboxResponse.kt

@@ -11,11 +11,13 @@ class JukeboxResponse(
     error: SubsonicError?,
     var jukebox: JukeboxStatus = JukeboxStatus()
 ) : SubsonicResponse(status, version, error) {
-    @JsonSetter("jukeboxStatus") fun setJukeboxStatus(jukebox: JukeboxStatus) {
+    @JsonSetter("jukeboxStatus")
+    fun setJukeboxStatus(jukebox: JukeboxStatus) {
         this.jukebox = jukebox
     }
 
-    @JsonSetter("jukeboxPlaylist") fun setJukeboxPlaylist(jukebox: JukeboxStatus) {
+    @JsonSetter("jukeboxPlaylist")
+    fun setJukeboxPlaylist(jukebox: JukeboxStatus) {
         this.jukebox = jukebox
     }
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt

@@ -10,7 +10,8 @@ class MusicFoldersResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("musicFolders") private val wrapper = MusicFoldersWrapper()
+    @JsonProperty("musicFolders")
+    private val wrapper = MusicFoldersWrapper()
 
     val musicFolders get() = wrapper.musicFolders
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SharesResponse.kt

@@ -10,7 +10,8 @@ class SharesResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("shares") private val wrappedShares = SharesWrapper()
+    @JsonProperty("shares")
+    private val wrappedShares = SharesWrapper()
 
     val shares get() = wrappedShares.share
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SubsonicResponse.kt

@@ -20,7 +20,8 @@ open class SubsonicResponse(
 ) {
     @JsonDeserialize(using = Status.Companion.StatusJsonDeserializer::class)
     enum class Status(val jsonValue: String) {
-        OK("ok"), ERROR("failed");
+        OK("ok"),
+        ERROR("failed");
 
         companion object {
             fun getStatusFromJson(jsonValue: String) =

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/VideosResponse.kt

@@ -10,7 +10,8 @@ class VideosResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("videos") private val videosWrapper = VideosWrapper()
+    @JsonProperty("videos")
+    private val videosWrapper = VideosWrapper()
 
     val videosList: List<MusicDirectoryChild> get() = videosWrapper.videosList
 }

core/subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/ProxyPasswordInterceptorTest.kt

@@ -18,7 +18,9 @@ class ProxyPasswordInterceptorTest {
 
     private val proxyInterceptor = ProxyPasswordInterceptor(
         V1_12_0,
-        mockPasswordHexInterceptor, mockPasswordMd5Interceptor, false
+        mockPasswordHexInterceptor,
+        mockPasswordMd5Interceptor,
+        false
     )
 
     @Test
@@ -40,8 +42,10 @@ class ProxyPasswordInterceptorTest {
     @Test
     fun `Should use hex password if forceHex is true`() {
         val interceptor = ProxyPasswordInterceptor(
-            V1_16_0, mockPasswordHexInterceptor,
+            V1_16_0,
-            mockPasswordMd5Interceptor, true
+            mockPasswordHexInterceptor,
+            mockPasswordMd5Interceptor,
+            true
         )
 
         interceptor.intercept(mockChain)

gradle/libs.versions.toml

@@ -3,38 +3,38 @@
 gradle                 = "8.1.1"
 
 navigation             = "2.7.5"
-gradlePlugin           = "8.1.2"
+gradlePlugin           = "8.2.0"
 androidxcar            = "1.2.0"
 androidxcore           = "1.12.0"
-ktlint                 = "0.43.2"
+ktlint                 = "1.0.1"
-ktlintGradle           = "11.6.1"
+ktlintGradle           = "12.0.2"
-detekt                 = "1.23.3"
+detekt                 = "1.23.4"
 preferences            = "1.2.1"
 media3                 = "1.1.1"
 
 androidSupport         = "1.7.0"
 materialDesign         = "1.10.0"
 constraintLayout       = "2.1.4"
-activity               = "1.8.0"
+activity               = "1.8.1"
 multidex               = "2.0.1"
-room                   = "2.6.0"
+room                   = "2.6.1"
-kotlin                 = "1.9.20"
+kotlin                 = "1.9.21"
-ksp                    = "1.9.10-1.0.13"
+ksp                    = "1.9.21-1.0.15"
 kotlinxCoroutines      = "1.7.3"
 viewModelKtx           = "2.6.2"
 swipeRefresh           = "1.1.0"
 
 retrofit               = "2.9.0"
 ## KEEP ON 2.13 branch (https://github.com/FasterXML/jackson-databind/issues/3658#issuecomment-1312633064) for compatibility with API 24
-jackson                = "2.15.3"
+jackson                = "2.16.0"
 okhttp                 = "4.12.0"
 koin                   = "3.5.0"
 picasso                = "2.8"
 
 junit4                 = "4.13.2"
-junit5                 = "5.10.0"
+junit5                 = "5.10.1"
-mockito                = "5.7.0"
+mockito                = "5.8.0"
-mockitoKotlin          = "5.1.0"
+mockitoKotlin          = "5.2.1"
 kluent                 = "1.73"
 apacheCodecs           = "1.16.0"
 robolectric            = "4.11.1"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt

@@ -204,10 +204,11 @@ class NavigationActivity : ScopeActivity() {
         }
 
         rxBusSubscription += RxBus.playerStateObservable.subscribe {
-            if (it.state == STATE_READY)
+            if (it.state == STATE_READY) {
                 showNowPlaying()
-            else
+            } else {
                 hideNowPlaying()
+            }
         }
 
         rxBusSubscription += RxBus.themeChangedEventObservable.subscribe {
@@ -314,8 +315,11 @@ class NavigationActivity : ScopeActivity() {
         // Lifecycle support's constructor registers some event receivers so it should be created early
         lifecycleSupport.onCreate()
 
-        if (!nowPlayingHidden) showNowPlaying()
+        if (!nowPlayingHidden) {
-        else hideNowPlaying()
+            showNowPlaying()
+        } else {
+            hideNowPlaying()
+        }
     }
 
     /*
@@ -334,21 +338,24 @@ class NavigationActivity : ScopeActivity() {
 
         val activeServer = activeServerProvider.getActiveServer()
 
-        if (cachedServerCount == 0)
+        if (cachedServerCount == 0) {
             selectServerButton?.text = getString(R.string.main_setup_server, activeServer.name)
-        else selectServerButton?.text = activeServer.name
+        } else {
+            selectServerButton?.text = activeServer.name
+        }
 
         val foregroundColor =
             ServerColor.getForegroundColor(this, activeServer.color, showVectorBackground)
         val backgroundColor =
             ServerColor.getBackgroundColor(this, activeServer.color)
 
-        if (activeServer.index == 0)
+        if (activeServer.index == 0) {
             selectServerButton?.icon =
                 ContextCompat.getDrawable(this, R.drawable.ic_menu_screen_on_off)
-        else
+        } else {
             selectServerButton?.icon =
                 ContextCompat.getDrawable(this, R.drawable.ic_menu_select_server)
+        }
 
         selectServerButton?.iconTint = ColorStateList.valueOf(foregroundColor)
         selectServerButton?.setTextColor(foregroundColor)
@@ -406,8 +413,9 @@ class NavigationActivity : ScopeActivity() {
             navigationView?.getHeaderView(0)?.findViewById(R.id.edit_server_button)
 
         val onClick: (View) -> Unit = {
-            if (drawerLayout?.isDrawerVisible(GravityCompat.START) == true)
+            if (drawerLayout?.isDrawerVisible(GravityCompat.START) == true) {
                 this.drawerLayout?.closeDrawer(GravityCompat.START)
+            }
             navController.navigate(R.id.serverSelectorFragment)
         }
 
@@ -473,7 +481,8 @@ class NavigationActivity : ScopeActivity() {
     private fun handleSearchIntent(query: String?, autoPlay: Boolean) {
         val suggestions = SearchRecentSuggestions(
             this,
-            SearchSuggestionProvider.AUTHORITY, SearchSuggestionProvider.MODE
+            SearchSuggestionProvider.AUTHORITY,
+            SearchSuggestionProvider.MODE
         )
         suggestions.saveRecentQuery(query, null)
 
@@ -528,7 +537,6 @@ class NavigationActivity : ScopeActivity() {
 
     private fun showWelcomeDialog() {
         if (!UApp.instance!!.setupDialogDisplayed) {
-
             Settings.firstInstalledVersion = Util.getVersionCode(UApp.applicationContext())
 
             InfoDialog.Builder(this)

ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/AlbumRowDelegate.kt

@@ -32,7 +32,7 @@ import org.moire.ultrasonic.util.LayoutType
  */
 open class AlbumRowDelegate(
     open val onItemClick: (Album) -> Unit,
-    open val onContextMenuClick: (MenuItem, Album) -> Boolean,
+    open val onContextMenuClick: (MenuItem, Album) -> Boolean
 ) : ItemViewDelegate<Album, AlbumRowDelegate.ListViewHolder>(), KoinComponent {
 
     private val starDrawable: Int = R.drawable.rating_star_full
@@ -61,8 +61,11 @@ open class AlbumRowDelegate(
         val imageLoaderProvider: ImageLoaderProvider by inject()
         imageLoaderProvider.executeOn {
             it.loadImage(
-                holder.coverArt, item,
+                holder.coverArt,
-                false, 0, R.drawable.unknown_album
+                item,
+                false,
+                0,
+                R.drawable.unknown_album
             )
         }
     }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/DividerBinder.kt

@@ -23,10 +23,7 @@ class DividerBinder : ItemViewBinder<DividerBinder.Divider, DividerBinder.ViewHo
         holder.textView.setText(item.stringId)
     }
 
-    override fun onCreateViewHolder(
+    override fun onCreateViewHolder(inflater: LayoutInflater, parent: ViewGroup): ViewHolder {
-        inflater: LayoutInflater,
-        parent: ViewGroup
-    ): ViewHolder {
         return ViewHolder(inflater.inflate(layout, parent, false))
     }
 

ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/FolderSelectorBinder.kt

@@ -78,7 +78,10 @@ class FolderSelectorBinder(context: Context) :
             val popup = PopupMenu(weakContext.get()!!, layout)
 
             var menuItem = popup.menu.add(
-                MENU_GROUP_MUSIC_FOLDER, -1, 0, R.string.select_artist_all_folders
+                MENU_GROUP_MUSIC_FOLDER,
+                -1,
+                0,
+                R.string.select_artist_all_folders
             )
 
             if (selectedFolderId == null || selectedFolderId!!.isEmpty()) {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/HeaderViewBinder.kt

@@ -46,7 +46,6 @@ class HeaderViewBinder(
     }
 
     override fun onBindViewHolder(holder: ViewHolder, item: AlbumHeader) {
-
         val context = weakContext.get() ?: return
         val resources = context.resources
 
@@ -98,7 +97,8 @@ class HeaderViewBinder(
         holder.yearView.text = year
 
         val songs = resources.getQuantityString(
-            R.plurals.n_songs, item.childCount,
+            R.plurals.n_songs,
+            item.childCount,
             item.childCount
         )
         holder.songCountView.text = songs

ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ServerRowAdapter.kt

@@ -77,7 +77,6 @@ internal class ServerRowAdapter(
      */
     @Suppress("LongMethod")
     override fun getView(pos: Int, convertView: View?, parent: ViewGroup?): View? {
-
         var vi: View? = convertView
         if (vi == null) vi = inflater.inflate(R.layout.server_row, parent, false)
 

ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt

@@ -167,7 +167,10 @@ class TrackViewHolder(val view: View) :
         if (isPlaying && !isPlayingCached) {
             isPlayingCached = true
             title.setCompoundDrawablesWithIntrinsicBounds(
-                playingIcon, null, null, null
+                playingIcon,
+                null,
+                null,
+                null
             )
             val color = MaterialColors.getColor(view, COLOR_HIGHLIGHT)
             songLayout.setBackgroundColor(color)
@@ -175,7 +178,10 @@ class TrackViewHolder(val view: View) :
         } else if (!isPlaying && isPlayingCached) {
             isPlayingCached = false
             title.setCompoundDrawablesWithIntrinsicBounds(
-                0, 0, 0, 0
+                0,
+                0,
+                0,
+                0
             )
             songLayout.setBackgroundColor(Color.TRANSPARENT)
             songLayout.elevation = 0F
@@ -282,7 +288,8 @@ class TrackViewHolder(val view: View) :
                 showProgress()
             }
             DownloadState.RETRYING,
-            DownloadState.QUEUED -> {
+            DownloadState.QUEUED
+            -> {
                 showIndefiniteProgress()
             }
             else -> {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/audiofx/EqualizerController.kt

@@ -50,7 +50,8 @@ class EqualizerController : CoroutineScope by CoroutineScope(Dispatchers.IO) {
         launch {
             try {
                 val settings = deserialize<EqualizerSettings>(
-                    UApp.applicationContext(), "equalizer.dat"
+                    UApp.applicationContext(),
+                    "equalizer.dat"
                 )
                 settings?.apply(equalizer!!)
             } catch (all: Throwable) {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt

@@ -51,7 +51,8 @@ class ActiveServerProvider(
                 }
                 Timber.d(
                     "getActiveServer retrieved from DataBase, id: %s cachedServer: %s",
-                    serverId, cachedServer
+                    serverId,
+                    cachedServer
                 )
             }
 

ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/AppDatabase.kt

@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:max-line-length")
+
 package org.moire.ultrasonic.data
 
 import androidx.room.Database
@@ -265,21 +267,27 @@ val MIGRATION_5_4: Migration = object : Migration(5, 4) {
         database.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`")
     }
 }
-/* ktlint-disable max-line-length */
 val MIGRATION_5_6: Migration = object : Migration(5, 6) {
     override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE IF NOT EXISTS `_new_ServerSetting` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, `color` INTEGER, `userName` TEXT NOT NULL, `password` TEXT NOT NULL, `jukeboxByDefault` INTEGER NOT NULL, `allowSelfSignedCertificate` INTEGER NOT NULL, `forcePlainTextPassword` INTEGER NOT NULL, `musicFolderId` TEXT, `minimumApiVersion` TEXT, `chatSupport` INTEGER, `bookmarkSupport` INTEGER, `shareSupport` INTEGER, `podcastSupport` INTEGER, `jukeboxSupport` INTEGER, `videoSupport` INTEGER)")
+        database.execSQL(
-        database.execSQL("INSERT INTO `_new_ServerSetting` (`musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`forcePlainTextPassword`,`id`,`allowSelfSignedCertificate`,`chatSupport`) SELECT `musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`ldapSupport`,`id`,`allowSelfSignedCertificate`,`chatSupport` FROM `ServerSetting`")
+            "CREATE TABLE IF NOT EXISTS `_new_ServerSetting` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, `color` INTEGER, `userName` TEXT NOT NULL, `password` TEXT NOT NULL, `jukeboxByDefault` INTEGER NOT NULL, `allowSelfSignedCertificate` INTEGER NOT NULL, `forcePlainTextPassword` INTEGER NOT NULL, `musicFolderId` TEXT, `minimumApiVersion` TEXT, `chatSupport` INTEGER, `bookmarkSupport` INTEGER, `shareSupport` INTEGER, `podcastSupport` INTEGER, `jukeboxSupport` INTEGER, `videoSupport` INTEGER)"
+        )
+        database.execSQL(
+            "INSERT INTO `_new_ServerSetting` (`musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`forcePlainTextPassword`,`id`,`allowSelfSignedCertificate`,`chatSupport`) SELECT `musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`ldapSupport`,`id`,`allowSelfSignedCertificate`,`chatSupport` FROM `ServerSetting`"
+        )
         database.execSQL("DROP TABLE `ServerSetting`")
         database.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`")
     }
 }
 val MIGRATION_6_5: Migration = object : Migration(6, 5) {
     override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE IF NOT EXISTS `_new_ServerSetting` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, `color` INTEGER, `userName` TEXT NOT NULL, `password` TEXT NOT NULL, `jukeboxByDefault` INTEGER NOT NULL, `allowSelfSignedCertificate` INTEGER NOT NULL, `ldapSupport` INTEGER NOT NULL, `musicFolderId` TEXT, `minimumApiVersion` TEXT, `chatSupport` INTEGER, `bookmarkSupport` INTEGER, `shareSupport` INTEGER, `podcastSupport` INTEGER)")
+        database.execSQL(
-        database.execSQL("INSERT INTO `_new_ServerSetting` (`musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`ldapSupport`,`id`,`allowSelfSignedCertificate`,`chatSupport`) SELECT `musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`forcePlainTextPassword`,`id`,`allowSelfSignedCertificate`,`chatSupport` FROM `ServerSetting`")
+            "CREATE TABLE IF NOT EXISTS `_new_ServerSetting` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, `color` INTEGER, `userName` TEXT NOT NULL, `password` TEXT NOT NULL, `jukeboxByDefault` INTEGER NOT NULL, `allowSelfSignedCertificate` INTEGER NOT NULL, `ldapSupport` INTEGER NOT NULL, `musicFolderId` TEXT, `minimumApiVersion` TEXT, `chatSupport` INTEGER, `bookmarkSupport` INTEGER, `shareSupport` INTEGER, `podcastSupport` INTEGER)"
+        )
+        database.execSQL(
+            "INSERT INTO `_new_ServerSetting` (`musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`ldapSupport`,`id`,`allowSelfSignedCertificate`,`chatSupport`) SELECT `musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`forcePlainTextPassword`,`id`,`allowSelfSignedCertificate`,`chatSupport` FROM `ServerSetting`"
+        )
         database.execSQL("DROP TABLE `ServerSetting`")
         database.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`")
     }
 }
-/* ktlint-enable max-line-length */

ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/CachedDataSource.kt

@@ -39,9 +39,7 @@ class CachedDataSource(
             )
         }
 
-        private fun createDataSourceInternal(
+        private fun createDataSourceInternal(upstreamDataSource: DataSource): CachedDataSource {
-            upstreamDataSource: DataSource
-        ): CachedDataSource {
             return CachedDataSource(
                 upstreamDataSource
             )
@@ -93,7 +91,9 @@ class CachedDataSource(
                 readInternal(buffer, offset, length)
             } catch (e: IOException) {
                 throw HttpDataSourceException.createForIOException(
-                    e, Util.castNonNull(dataSpec), HttpDataSourceException.TYPE_READ
+                    e,
+                    Util.castNonNull(dataSpec),
+                    HttpDataSourceException.TYPE_READ
                 )
             }
         } else {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt

@@ -5,6 +5,8 @@
  * Distributed under terms of the GNU GPLv3 license.
  */
 
+@file:Suppress("ktlint:standard:max-line-length")
+
 package org.moire.ultrasonic.data
 
 import androidx.room.AutoMigration
@@ -37,7 +39,7 @@ import org.moire.ultrasonic.domain.Track
         AutoMigration(
             from = 1,
             to = 2
-        ),
+        )
     ],
     exportSchema = true,
     version = 3
@@ -67,7 +69,6 @@ class Converters {
     }
 }
 
-/* ktlint-disable max-line-length */
 val META_MIGRATION_2_3: Migration = object : Migration(2, 3) {
     override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL("DROP TABLE `albums`")
@@ -75,11 +76,20 @@ val META_MIGRATION_2_3: Migration = object : Migration(2, 3) {
         database.execSQL("DROP TABLE `artists`")
         database.execSQL("DROP TABLE `tracks`")
         database.execSQL("DROP TABLE `music_folders`")
-        database.execSQL("CREATE TABLE IF NOT EXISTS `albums` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `parent` TEXT, `album` TEXT, `title` TEXT, `name` TEXT, `discNumber` INTEGER, `coverArt` TEXT, `songCount` INTEGER, `created` INTEGER, `artist` TEXT, `artistId` TEXT, `duration` INTEGER, `year` INTEGER, `genre` TEXT, `starred` INTEGER NOT NULL, `path` TEXT, `closeness` INTEGER NOT NULL, `isDirectory` INTEGER NOT NULL, `isVideo` INTEGER NOT NULL, PRIMARY KEY(`id`, `serverId`))")
+        database.execSQL(
-        database.execSQL("CREATE TABLE IF NOT EXISTS `indexes` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `name` TEXT, `index` TEXT, `coverArt` TEXT, `albumCount` INTEGER, `closeness` INTEGER NOT NULL, `musicFolderId` TEXT, PRIMARY KEY(`id`, `serverId`))")
+            "CREATE TABLE IF NOT EXISTS `albums` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `parent` TEXT, `album` TEXT, `title` TEXT, `name` TEXT, `discNumber` INTEGER, `coverArt` TEXT, `songCount` INTEGER, `created` INTEGER, `artist` TEXT, `artistId` TEXT, `duration` INTEGER, `year` INTEGER, `genre` TEXT, `starred` INTEGER NOT NULL, `path` TEXT, `closeness` INTEGER NOT NULL, `isDirectory` INTEGER NOT NULL, `isVideo` INTEGER NOT NULL, PRIMARY KEY(`id`, `serverId`))"
-        database.execSQL("CREATE TABLE IF NOT EXISTS `artists` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `name` TEXT, `index` TEXT, `coverArt` TEXT, `albumCount` INTEGER, `closeness` INTEGER NOT NULL, PRIMARY KEY(`id`, `serverId`))")
+        )
-        database.execSQL("CREATE TABLE IF NOT EXISTS `music_folders` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, PRIMARY KEY(`id`, `serverId`))")
+        database.execSQL(
-        database.execSQL("CREATE TABLE IF NOT EXISTS `tracks` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `parent` TEXT, `isDirectory` INTEGER NOT NULL, `title` TEXT, `album` TEXT, `albumId` TEXT, `artist` TEXT, `artistId` TEXT, `track` INTEGER, `year` INTEGER, `genre` TEXT, `contentType` TEXT, `suffix` TEXT, `transcodedContentType` TEXT, `transcodedSuffix` TEXT, `coverArt` TEXT, `size` INTEGER, `songCount` INTEGER, `duration` INTEGER, `bitRate` INTEGER, `path` TEXT, `isVideo` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `discNumber` INTEGER, `type` TEXT, `created` INTEGER, `closeness` INTEGER NOT NULL, `bookmarkPosition` INTEGER NOT NULL, `userRating` INTEGER, `averageRating` REAL, `name` TEXT, PRIMARY KEY(`id`, `serverId`))")
+            "CREATE TABLE IF NOT EXISTS `indexes` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `name` TEXT, `index` TEXT, `coverArt` TEXT, `albumCount` INTEGER, `closeness` INTEGER NOT NULL, `musicFolderId` TEXT, PRIMARY KEY(`id`, `serverId`))"
+        )
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `artists` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `name` TEXT, `index` TEXT, `coverArt` TEXT, `albumCount` INTEGER, `closeness` INTEGER NOT NULL, PRIMARY KEY(`id`, `serverId`))"
+        )
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `music_folders` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, PRIMARY KEY(`id`, `serverId`))"
+        )
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `tracks` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `parent` TEXT, `isDirectory` INTEGER NOT NULL, `title` TEXT, `album` TEXT, `albumId` TEXT, `artist` TEXT, `artistId` TEXT, `track` INTEGER, `year` INTEGER, `genre` TEXT, `contentType` TEXT, `suffix` TEXT, `transcodedContentType` TEXT, `transcodedSuffix` TEXT, `coverArt` TEXT, `size` INTEGER, `songCount` INTEGER, `duration` INTEGER, `bitRate` INTEGER, `path` TEXT, `isVideo` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `discNumber` INTEGER, `type` TEXT, `created` INTEGER, `closeness` INTEGER NOT NULL, `bookmarkPosition` INTEGER NOT NULL, `userRating` INTEGER, `averageRating` REAL, `name` TEXT, PRIMARY KEY(`id`, `serverId`))"
+        )
     }
 }
-/* ktlint-enable max-line-length */

ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt

@@ -1,4 +1,5 @@
 @file:JvmName("MusicServiceModule")
+
 package org.moire.ultrasonic.di
 
 import kotlin.math.abs

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIAlbumConverter.kt

@@ -8,6 +8,7 @@
 // Converts Album entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
 // to app domain entities.
 @file:JvmName("APIAlbumConverter")
+
 package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.Album

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIArtistConverter.kt

@@ -8,6 +8,7 @@
 // Converts Artist entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
 // to app domain entities.
 @file:JvmName("APIArtistConverter")
+
 package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.Artist as APIArtist

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverter.kt

@@ -1,5 +1,6 @@
 // Contains helper functions to convert from api ChatMessage entity to domain entity
 @file:JvmName("APIChatMessageConverter")
+
 package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.ChatMessage as ApiChatMessage

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt

@@ -1,5 +1,6 @@
 // Collection of functions to convert api Genre entity to domain entity
 @file:JvmName("ApiGenreConverter")
+
 package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.Genre as APIGenre

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIJukeboxCoverter.kt

@@ -1,5 +1,6 @@
 // Collection of function to convert subsonic api jukebox responses to app entities
 @file:JvmName("APIJukeboxConverter")
+
 package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.JukeboxStatus as ApiJukeboxStatus

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APILyricsConverter.kt

@@ -1,6 +1,7 @@
 // Converts Lyrics entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
 // to app domain entities.
 @file:JvmName("APILyricsConverter")
+
 package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.Lyrics as APILyrics

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt

@@ -6,6 +6,7 @@
  */
 
 @file:JvmName("APIMusicDirectoryConverter")
+
 package org.moire.ultrasonic.domain
 
 import java.text.DateFormat
@@ -35,10 +36,7 @@ fun MusicDirectoryChild.toAlbumEntity(serverId: Int): Album = Album(id, serverId
     populateCommonProps(this, this@toAlbumEntity)
 }
 
-private fun populateCommonProps(
+private fun populateCommonProps(entry: MusicDirectory.Child, source: MusicDirectoryChild) {
-    entry: MusicDirectory.Child,
-    source: MusicDirectoryChild
-) {
     entry.parent = source.parent
     entry.isDirectory = source.isDir
     entry.title = source.title
@@ -63,10 +61,7 @@ private fun populateCommonProps(
     }
 }
 
-private fun populateTrackProps(
+private fun populateTrackProps(track: Track, source: MusicDirectoryChild) {
-    track: Track,
-    source: MusicDirectoryChild
-) {
     track.size = source.size
     track.contentType = source.contentType
     track.suffix = source.suffix
@@ -84,10 +79,11 @@ fun List<MusicDirectoryChild>.toDomainEntityList(serverId: Int): List<MusicDirec
     val newList: MutableList<MusicDirectory.Child> = mutableListOf()
 
     forEach {
-        if (it.isDir)
+        if (it.isDir) {
             newList.add(it.toAlbumEntity(serverId))
-        else
+        } else {
             newList.add(it.toTrackEntity(serverId))
+        }
     }
 
     return newList

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicFolderConverter.kt

@@ -8,6 +8,7 @@
 // Converts MusicFolder entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
 // to app domain entities.
 @file:JvmName("APIMusicFolderConverter")
+
 package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.MusicFolder as APIMusicFolder
@@ -18,9 +19,8 @@ fun APIMusicFolder.toDomainEntity(serverId: Int): MusicFolder = MusicFolder(
     name = this.name
 )
 
-fun List<APIMusicFolder>.toDomainEntityList(serverId: Int): List<MusicFolder> =
+fun List<APIMusicFolder>.toDomainEntityList(serverId: Int): List<MusicFolder> = this.map {
-    this.map {
+    val item = it.toDomainEntity(serverId)
-        val item = it.toDomainEntity(serverId)
+    item.serverId = serverId
-        item.serverId = serverId
+    item
-        item
+}
-    }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt

@@ -31,8 +31,11 @@ fun APIPlaylist.toMusicDirectoryDomainEntity(serverId: Int): MusicDirectory =
     }
 
 fun APIPlaylist.toDomainEntity(): Playlist = Playlist(
-    this.id, this.name, this.owner,
+    this.id,
-    this.comment, this.songCount.toString(),
+    this.name,
+    this.owner,
+    this.comment,
+    this.songCount.toString(),
     this.created.ifNotNull { playlistDateFormat.format(it.time) } ?: "",
     public
 )

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPodcastConverter.kt

@@ -1,12 +1,17 @@
 // Converts podcasts entities from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
 // to app domain entities.
 @file:JvmName("APIPodcastConverter")
+
 package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.PodcastChannel
 
 fun PodcastChannel.toDomainEntity(): PodcastsChannel = PodcastsChannel(
-    this.id, this.title, this.url, this.description, this.status
+    this.id,
+    this.title,
+    this.url,
+    this.description,
+    this.status
 )
 
 fun List<PodcastChannel>.toDomainEntitiesList(): List<PodcastsChannel> = this

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APISearchConverter.kt

@@ -8,6 +8,7 @@
 // Converts SearchResult entities from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
 // to app domain entities.
 @file:JvmName("APISearchConverter")
+
 package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.SearchResult as APISearchResult
@@ -15,7 +16,8 @@ import org.moire.ultrasonic.api.subsonic.models.SearchThreeResult
 import org.moire.ultrasonic.api.subsonic.models.SearchTwoResult
 
 fun APISearchResult.toDomainEntity(serverId: Int): SearchResult = SearchResult(
-    emptyList(), emptyList(),
+    emptyList(),
+    emptyList(),
     this.matchList.map { it.toTrackEntity(serverId) }
 )
 

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIShareConverter.kt

@@ -7,6 +7,7 @@
 
 // Contains helper method to convert subsonic api share to domain model
 @file:JvmName("APIShareConverter")
+
 package org.moire.ultrasonic.domain
 
 import java.text.SimpleDateFormat

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIUserConverter.kt

@@ -1,5 +1,6 @@
 // Helper functions to convert User entity to domain entity
 @file:JvmName("APIUserConverter")
+
 package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.User

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumListFragment.kt

@@ -65,10 +65,7 @@ class AlbumListFragment(
     /**
      * The central function to pass a query to the model and return a LiveData object
      */
-    override fun getLiveData(
+    override fun getLiveData(refresh: Boolean, append: Boolean): LiveData<List<Album>> {
-        refresh: Boolean,
-        append: Boolean
-    ): LiveData<List<Album>> {
         fetchAlbums(refresh)
 
         return listModel.list

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/BookmarksFragment.kt

@@ -68,7 +68,6 @@ class BookmarksFragment : TrackCollectionFragment() {
      */
     private fun playNow(songs: List<Track>) {
         if (songs.isNotEmpty()) {
-
             mediaPlayerManager.addToPlaylist(
                 songs = songs,
                 autoPlay = false,

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt

@@ -86,7 +86,8 @@ class EditServerFragment : Fragment() {
 
     override fun onAttach(context: Context) {
         requireActivity().onBackPressedDispatcher.addCallback(
-            this, confirmCloseCallback
+            this,
+            confirmCloseCallback
         )
         super.onAttach(context)
     }
@@ -186,7 +187,7 @@ class EditServerFragment : Fragment() {
                     }
                 )
                 .setNegativeButton(getString(R.string.common_cancel)) {
-                    dialogInterface, _ ->
+                        dialogInterface, _ ->
                     dialogInterface.dismiss()
                 }
                 .setBottomSpace(DIALOG_PADDING)
@@ -199,7 +200,8 @@ class EditServerFragment : Fragment() {
     }
 
     private val confirmCloseCallback = object : OnBackPressedCallback(
-        true // default to enabled
+        // default to enabled
+        true
     ) {
         override fun handleOnBackPressed() {
             finishActivity()
@@ -231,35 +233,46 @@ class EditServerFragment : Fragment() {
     }
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         savedInstanceState.putString(
-            ::serverNameEditText.name, serverNameEditText!!.editText?.text.toString()
+            ::serverNameEditText.name,
+            serverNameEditText!!.editText?.text.toString()
         )
         savedInstanceState.putString(
-            ::serverAddressEditText.name, serverAddressEditText!!.editText?.text.toString()
+            ::serverAddressEditText.name,
+            serverAddressEditText!!.editText?.text.toString()
         )
         savedInstanceState.putString(
-            ::userNameEditText.name, userNameEditText!!.editText?.text.toString()
+            ::userNameEditText.name,
+            userNameEditText!!.editText?.text.toString()
         )
         savedInstanceState.putString(
-            ::passwordEditText.name, passwordEditText!!.editText?.text.toString()
+            ::passwordEditText.name,
+            passwordEditText!!.editText?.text.toString()
         )
         savedInstanceState.putBoolean(
-            ::selfSignedSwitch.name, selfSignedSwitch!!.isChecked
+            ::selfSignedSwitch.name,
+            selfSignedSwitch!!.isChecked
         )
         savedInstanceState.putBoolean(
-            ::plaintextSwitch.name, plaintextSwitch!!.isChecked
+            ::plaintextSwitch.name,
+            plaintextSwitch!!.isChecked
         )
         savedInstanceState.putBoolean(
-            ::jukeboxSwitch.name, jukeboxSwitch!!.isChecked
+            ::jukeboxSwitch.name,
+            jukeboxSwitch!!.isChecked
         )
         savedInstanceState.putInt(
-            ::serverColorImageView.name, currentColor
+            ::serverColorImageView.name,
+            currentColor
         )
-        if (selectedColor != null)
+        if (selectedColor != null) {
             savedInstanceState.putInt(
-                ::selectedColor.name, selectedColor!!
+                ::selectedColor.name,
+                selectedColor!!
             )
+        }
         savedInstanceState.putBoolean(
-            ::isInstanceStateSaved.name, true
+            ::isInstanceStateSaved.name,
+            true
         )
 
         super.onSaveInstanceState(savedInstanceState)
@@ -286,8 +299,9 @@ class EditServerFragment : Fragment() {
         plaintextSwitch!!.isChecked = savedInstanceState.getBoolean(::plaintextSwitch.name)
         jukeboxSwitch!!.isChecked = savedInstanceState.getBoolean(::jukeboxSwitch.name)
         updateColor(savedInstanceState.getInt(::serverColorImageView.name))
-        if (savedInstanceState.containsKey(::selectedColor.name))
+        if (savedInstanceState.containsKey(::selectedColor.name)) {
             selectedColor = savedInstanceState.getInt(::selectedColor.name)
+        }
         isInstanceStateSaved = savedInstanceState.getBoolean(::isInstanceStateSaved.name)
     }
 
@@ -434,7 +448,7 @@ class EditServerFragment : Fragment() {
             serverSetting.shareSupport,
             serverSetting.podcastSupport,
             serverSetting.videoSupport,
-            serverSetting.jukeboxSupport,
+            serverSetting.jukeboxSupport
         ).any { x -> x == false }
 
         var progressString = String.format(
@@ -445,7 +459,7 @@ class EditServerFragment : Fragment() {
                     |%s - ${resources.getString(R.string.button_bar_podcasts)}
                     |%s - ${resources.getString(R.string.main_videos)}
                     |%s - ${resources.getString(R.string.jukebox)}
-                    """.trimMargin(),
+            """.trimMargin(),
             boolToMark(serverSetting.chatSupport),
             boolToMark(serverSetting.bookmarkSupport),
             boolToMark(serverSetting.shareSupport),
@@ -453,15 +467,17 @@ class EditServerFragment : Fragment() {
             boolToMark(serverSetting.videoSupport),
             boolToMark(serverSetting.jukeboxSupport)
         )
-        if (isAnyDisabled)
+        if (isAnyDisabled) {
             progressString += "\n\n" + resources.getString(R.string.server_editor_disabled_feature)
+        }
 
         return progressString
     }
 
     private fun boolToMark(value: Boolean?): String {
-        if (value == null)
+        if (value == null) {
             return "⌛"
+        }
         return if (value) "✔️" else "❌"
     }
 

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EntryListFragment.kt

@@ -54,7 +54,7 @@ abstract class EntryListFragment<T : GenericEntry> : MultiListFragment<T>(), Koi
             id = item.id,
             name = item.name,
             parentId = item.id,
-            isArtist = (item is Artist),
+            isArtist = (item is Artist)
         )
 
         findNavController().navigate(action)

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EqualizerFragment.kt

@@ -92,7 +92,9 @@ class EqualizerFragment : Fragment() {
         }
         for (preset in 0 until equalizer!!.numberOfPresets) {
             val menuItem = menu.add(
-                MENU_GROUP_PRESET, preset, preset,
+                MENU_GROUP_PRESET,
+                preset,
+                preset,
                 equalizer!!.getPresetName(
                     preset.toShort()
                 )
@@ -188,11 +190,7 @@ class EqualizerFragment : Fragment() {
         updateLevelText(levelTextView, bandLevel)
 
         bar.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
-            override fun onProgressChanged(
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
-                seekBar: SeekBar,
-                progress: Int,
-                fromUser: Boolean
-            ) {
                 val level = (progress + minEQLevel).toShort()
                 if (fromUser) {
                     try {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MainFragment.kt

@@ -58,7 +58,6 @@ class MainFragment : ScopeFragment(), KoinScopeComponent {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-
         FragmentTitle.setTitle(this, R.string.music_library_label)
 
         // Load last layout from settings
@@ -133,10 +132,7 @@ class MainFragment : ScopeFragment(), KoinScopeComponent {
         return findFragmentAtPosition(childFragmentManager, viewPager.currentItem)
     }
 
-    private fun findFragmentAtPosition(
+    private fun findFragmentAtPosition(fragmentManager: FragmentManager, position: Int): Fragment? {
-        fragmentManager: FragmentManager,
-        position: Int
-    ): Fragment? {
         // If a fragment was recently created and never shown the fragment manager might not
         // hold a reference to it. Fallback on the WeakMap instead.
         return fragmentManager.findFragmentByTag("f$position")
@@ -172,7 +168,6 @@ class MusicCollectionAdapter(fragment: Fragment, initialType: LayoutType = Layou
     }
 
     override fun createFragment(position: Int): Fragment {
-
         Timber.i("Creating new fragment at position: $position")
 
         val action = when (position) {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MultiListFragment.kt

@@ -96,9 +96,11 @@ abstract class MultiListFragment<T : Identifiable> : ScopeFragment(), Refreshabl
         if (title == null) {
             FragmentTitle.setTitle(
                 this,
-                if (listModel.isOffline())
+                if (listModel.isOffline()) {
                     R.string.music_library_label_offline
-                else R.string.music_library_label
+                } else {
+                    R.string.music_library_label
+                }
             )
         } else {
             FragmentTitle.setTitle(this, title)

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt

@@ -181,6 +181,7 @@ class PlayerFragment :
     private lateinit var fullHeartDrawable: Drawable
 
     private var _binding: CurrentPlayingBinding? = null
+
     // This property is only valid between onCreateView and
     // onDestroyView.
     private val binding get() = _binding!!
@@ -339,8 +340,9 @@ class PlayerFragment :
         }
 
         playButton.setOnClickListener {
-            if (!mediaPlayerManager.isJukeboxEnabled)
+            if (!mediaPlayerManager.isJukeboxEnabled) {
                 networkAndStorageChecker.warnIfNetworkOrStorageUnavailable()
+            }
 
             launch(CommunicationError.getHandler(context)) {
                 mediaPlayerManager.play()
@@ -629,10 +631,7 @@ class PlayerFragment :
         return popup
     }
 
-    private fun onContextMenuItemSelected(
+    private fun onContextMenuItemSelected(menuItem: MenuItem, item: MusicDirectory.Child): Boolean {
-        menuItem: MenuItem,
-        item: MusicDirectory.Child
-    ): Boolean {
         if (item !is Track) return false
         return menuItemSelected(menuItem.itemId, item)
     }
@@ -699,8 +698,11 @@ class PlayerFragment :
                 val jukeboxEnabled = !mediaPlayerManager.isJukeboxEnabled
                 mediaPlayerManager.isJukeboxEnabled = jukeboxEnabled
                 toast(
-                    if (jukeboxEnabled) R.string.download_jukebox_on
+                    if (jukeboxEnabled) {
-                    else R.string.download_jukebox_off,
+                        R.string.download_jukebox_on
+                    } else {
+                        R.string.download_jukebox_off
+                    },
                     false
                 )
                 return true
@@ -765,7 +767,7 @@ class PlayerFragment :
                 }
                 shareHandler.createShare(
                     this,
-                    tracks = tracks,
+                    tracks = tracks
                 )
                 return true
             }
@@ -774,7 +776,7 @@ class PlayerFragment :
 
                 shareHandler.createShare(
                     this,
-                    listOf(track),
+                    listOf(track)
                 )
                 return true
             }
@@ -858,7 +860,7 @@ class PlayerFragment :
                 onContextMenuClick = { menu, id -> onContextMenuItemSelected(menu, id) },
                 checkable = false,
                 draggable = true,
-                lifecycleOwner = viewLifecycleOwner,
+                lifecycleOwner = viewLifecycleOwner
             ) { view, track -> onCreateContextMenu(view, track) }.apply {
                 this.startDrag = { holder ->
                     dragTouchHelper.startDrag(holder)
@@ -880,7 +882,6 @@ class PlayerFragment :
                 viewHolder: RecyclerView.ViewHolder,
                 target: RecyclerView.ViewHolder
             ): Boolean {
-
                 val from = viewHolder.bindingAdapterPosition
                 val to = target.bindingAdapterPosition
 
@@ -933,10 +934,7 @@ class PlayerFragment :
                 mediaPlayerManager.removeFromPlaylist(pos)
             }
 
-            override fun onSelectedChanged(
+            override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
-                viewHolder: RecyclerView.ViewHolder?,
-                actionState: Int
-            ) {
                 super.onSelectedChanged(viewHolder, actionState)
 
                 if (actionState == ACTION_STATE_DRAG) {
@@ -991,8 +989,10 @@ class PlayerFragment :
 
                     if (dX > 0) {
                         canvas.clipRect(
-                            itemView.left.toFloat(), itemView.top.toFloat(),
+                            itemView.left.toFloat(),
-                            dX, itemView.bottom.toFloat()
+                            itemView.top.toFloat(),
+                            dX,
+                            itemView.bottom.toFloat()
                         )
                         canvas.drawColor(backgroundColor)
                         val left = itemView.left + Util.dpToPx(16, activity!!)
@@ -1001,8 +1001,10 @@ class PlayerFragment :
                         drawable?.draw(canvas)
                     } else {
                         canvas.clipRect(
-                            itemView.right.toFloat() + dX, itemView.top.toFloat(),
+                            itemView.right.toFloat() + dX,
-                            itemView.right.toFloat(), itemView.bottom.toFloat(),
+                            itemView.top.toFloat(),
+                            itemView.right.toFloat(),
+                            itemView.bottom.toFloat()
                         )
                         canvas.drawColor(backgroundColor)
                         val left = itemView.right - Util.dpToPx(16, activity!!) - iconSize
@@ -1016,7 +1018,13 @@ class PlayerFragment :
                     viewHolder.itemView.translationX = dX
                 } else {
                     super.onChildDraw(
-                        canvas, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive
+                        canvas,
+                        recyclerView,
+                        viewHolder,
+                        dX,
+                        dY,
+                        actionState,
+                        isCurrentlyActive
                     )
                 }
             }
@@ -1052,8 +1060,9 @@ class PlayerFragment :
             songTitleTextView.text = currentSong!!.title
             artistTextView.text = currentSong!!.artist
             albumTextView.text = currentSong!!.album
-            if (currentSong!!.year != null && Settings.showNowPlayingDetails)
+            if (currentSong!!.year != null && Settings.showNowPlayingDetails) {
                 albumTextView.append(String.format(Locale.ROOT, " (%d)", currentSong!!.year))
+            }
 
             if (Settings.showNowPlayingDetails) {
                 genreTextView.text = currentSong!!.genre
@@ -1061,11 +1070,12 @@ class PlayerFragment :
                     (currentSong!!.genre != null && currentSong!!.genre!!.isNotBlank())
 
                 var bitRate = ""
-                if (currentSong!!.bitRate != null && currentSong!!.bitRate!! > 0)
+                if (currentSong!!.bitRate != null && currentSong!!.bitRate!! > 0) {
                     bitRate = String.format(
                         Util.appContext().getString(R.string.song_details_kbps),
                         currentSong!!.bitRate
                     )
+                }
                 bitrateFormatTextView.text = String.format(
                     Locale.ROOT, "%s %s",
                     bitRate, currentSong!!.suffix

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SearchFragment.kt

@@ -41,7 +41,6 @@ import org.moire.ultrasonic.subsonic.VideoPlayer.Companion.playVideo
 import org.moire.ultrasonic.util.ContextMenuUtil.handleContextMenu
 import org.moire.ultrasonic.util.ContextMenuUtil.handleContextMenuTracks
 import org.moire.ultrasonic.util.RefreshableFragment
-import org.moire.ultrasonic.util.Settings
 import org.moire.ultrasonic.util.Util
 import org.moire.ultrasonic.util.Util.toast
 import org.moire.ultrasonic.util.toastingExceptionHandler
@@ -143,7 +142,6 @@ class SearchFragment : MultiListFragment<Identifiable>(), KoinScopeComponent, Re
 
         val artists = result.artists
         if (artists.isNotEmpty()) {
-
             list.add(DividerBinder.Divider(R.string.search_artists))
             list.addAll(artists)
             if (searchResult!!.artists.size > artists.size) {
@@ -283,10 +281,4 @@ class SearchFragment : MultiListFragment<Identifiable>(), KoinScopeComponent, Re
             )
         }
     }
-
-    companion object {
-        var DEFAULT_ARTISTS = Settings.defaultArtists
-        var DEFAULT_ALBUMS = Settings.defaultAlbums
-        var DEFAULT_SONGS = Settings.defaultSongs
-    }
 }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt

@@ -17,7 +17,6 @@ import androidx.preference.PreferenceFragmentCompat
 import java.io.File
 import kotlin.math.ceil
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 import org.moire.ultrasonic.R
 import org.moire.ultrasonic.app.UApp
 import org.moire.ultrasonic.fragment.FragmentTitle.setTitle
@@ -28,7 +27,7 @@ import org.moire.ultrasonic.log.FileLoggerTree.Companion.getLogFileSizes
 import org.moire.ultrasonic.log.FileLoggerTree.Companion.plantToTimberForest
 import org.moire.ultrasonic.log.FileLoggerTree.Companion.uprootFromTimberForest
 import org.moire.ultrasonic.provider.SearchSuggestionProvider
-import org.moire.ultrasonic.service.MediaPlayerManager
+import org.moire.ultrasonic.service.DownloadService
 import org.moire.ultrasonic.service.RxBus
 import org.moire.ultrasonic.util.ConfirmationDialog
 import org.moire.ultrasonic.util.Constants
@@ -62,8 +61,6 @@ class SettingsFragment :
     private var debugLogToFile: CheckBoxPreference? = null
     private var customCacheLocation: CheckBoxPreference? = null
 
-    private val mediaPlayerManager: MediaPlayerManager by inject()
-
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.settings, rootKey)
     }
@@ -261,7 +258,8 @@ class SettingsFragment :
         val choice = intArrayOf(defaultChoice)
         ConfirmationDialog.Builder(requireContext()).setTitle(title)
             .setSingleChoiceItems(
-                R.array.bluetoothDeviceSettingNames, defaultChoice
+                R.array.bluetoothDeviceSettingNames,
+                defaultChoice
             ) { _: DialogInterface?, i: Int -> choice[0] = i }
             .setNegativeButton(R.string.common_cancel) { dialogInterface: DialogInterface, _: Int ->
                 dialogInterface.cancel()
@@ -344,7 +342,7 @@ class SettingsFragment :
         Settings.cacheLocationUri = path
 
         // Clear download queue.
-        mediaPlayerManager.clear()
+        DownloadService.clearDownloads()
         Storage.reset()
         Storage.checkForErrorsWithCustomRoot()
     }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt

@@ -365,9 +365,7 @@ open class TrackCollectionFragment(
         )
     }
 
-    private fun playSelectedOrAllTracks(
+    private fun playSelectedOrAllTracks(insertionMode: MediaPlayerManager.InsertionMode) {
-        insertionMode: MediaPlayerManager.InsertionMode
-    ) {
         mediaPlayerManager.playTracksAndToast(
             fragment = this,
             insertionMode = insertionMode,
@@ -403,9 +401,7 @@ open class TrackCollectionFragment(
         listModel.calculateButtonState(selection, ::updateButtonState)
     }
 
-    private fun updateButtonState(
+    private fun updateButtonState(show: TrackCollectionModel.Companion.ButtonStates) {
-        show: TrackCollectionModel.Companion.ButtonStates,
-    ) {
         // We are coming back from unknown context
         // and need to ensure Main Thread in order to manipulate the UI
         // If view is null, our view was disposed in the meantime
@@ -484,10 +480,11 @@ open class TrackCollectionFragment(
     internal fun getSelectedTracks(): List<Track> {
         // Walk through selected set and get the Entries based on the saved ids.
         return viewAdapter.getCurrentList().mapNotNull {
-            if (it is Track && viewAdapter.isSelected(it.longId))
+            if (it is Track && viewAdapter.isSelected(it.longId)) {
                 it
-            else
+            } else {
                 null
+            }
         }
     }
 
@@ -586,7 +583,6 @@ open class TrackCollectionFragment(
         menuItem: MenuItem,
         item: MusicDirectory.Child
     ): Boolean {
-
         val tracks = getClickedSong(item)
 
         return ContextMenuUtil.handleContextMenuTracks(
@@ -600,10 +596,11 @@ open class TrackCollectionFragment(
     private fun getClickedSong(item: MusicDirectory.Child): List<Track> {
         // This can probably be done better
         return viewAdapter.getCurrentList().mapNotNull {
-            if (it is Track && (it.id == item.id))
+            if (it is Track && (it.id == item.id)) {
                 it
-            else
+            } else {
                 null
+            }
         }
     }
 

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/ChatFragment.kt

@@ -112,9 +112,10 @@ class ChatFragment : Fragment(), KoinComponent, RefreshableFragment {
         })
         messageEditText.setOnEditorActionListener(
             OnEditorActionListener {
-                _: TextView?,
+                    _: TextView?,
-                actionId: Int,
+                    actionId: Int,
-                event: KeyEvent ->
+                    event: KeyEvent
+                ->
                 if (actionId == EditorInfo.IME_ACTION_SEND ||
                     (actionId == EditorInfo.IME_NULL && event.action == KeyEvent.ACTION_DOWN)
                 ) {
@@ -170,7 +171,8 @@ class ChatFragment : Fragment(), KoinComponent, RefreshableFragment {
                         requireActivity().runOnUiThread { load() }
                     }
                 },
-                refreshInterval.toLong(), refreshInterval.toLong()
+                refreshInterval.toLong(),
+                refreshInterval.toLong()
             )
         }
     }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/PlaylistsFragment.kt

@@ -87,7 +87,7 @@ class PlaylistsFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragme
                 id = id,
                 playlistId = id,
                 name = name,
-                playlistName = name,
+                playlistName = name
             )
             findNavController().navigate(action)
         }
@@ -120,10 +120,14 @@ class PlaylistsFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragme
     override fun onCreateContextMenu(menu: ContextMenu, view: View, menuInfo: ContextMenuInfo?) {
         super.onCreateContextMenu(menu, view, menuInfo)
         val inflater = requireActivity().menuInflater
-        if (isOffline()) inflater.inflate(
+        if (isOffline()) {
-            R.menu.select_playlist_context_offline,
+            inflater.inflate(
-            menu
+                R.menu.select_playlist_context_offline,
-        ) else inflater.inflate(R.menu.select_playlist_context, menu)
+                menu
+            )
+        } else {
+            inflater.inflate(R.menu.select_playlist_context, menu)
+        }
         val downloadMenuItem = menu.findItem(R.id.playlist_menu_download)
         if (downloadMenuItem != null) {
             downloadMenuItem.isVisible = !isOffline()
@@ -236,13 +240,17 @@ class PlaylistsFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragme
               Comments: ${playlist.comment}
               Song Count: ${playlist.songCount}
             """.trimIndent() +
-                if (playlist.public == null) "" else """
+                if (playlist.public == null) {
+                    ""
+                } else {
+                    """
  
  Public: ${playlist.public}
-                """.trimIndent() + """
+                    """.trimIndent() + """
       
   Creation Date: ${playlist.created.replace('T', ' ')}
-                """.trimIndent()
+                    """.trimIndent()
+                }
         )
         Linkify.addLinks(message, Linkify.WEB_URLS)
         textView.text = message

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SelectGenreFragment.kt

@@ -53,8 +53,8 @@ class SelectGenreFragment : Fragment(), RefreshableFragment {
         swipeRefresh?.setOnRefreshListener { load(true) }
 
         genreListView?.setOnItemClickListener {
-            parent: AdapterView<*>, _: View?,
+                parent: AdapterView<*>, _: View?,
-            position: Int, _: Long
+                position: Int, _: Long
             ->
             val genre = parent.getItemAtPosition(position) as Genre
 

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SharesFragment.kt

@@ -80,8 +80,9 @@ class SharesFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragment
         swipeRefresh!!.setOnRefreshListener { load(true) }
         emptyTextView = view.findViewById(R.id.select_share_empty)
         sharesListView!!.onItemClickListener = AdapterView.OnItemClickListener {
-            parent, _,
+                parent, _,
-            position, _ ->
+                position, _
+            ->
             val share = parent.getItemAtPosition(position) as Share
 
             val action = NavigationGraphDirections.toTrackCollection(
@@ -171,7 +172,7 @@ class SharesFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragment
                     insertionMode = MediaPlayerManager.InsertionMode.CLEAR,
                     id = share.id,
                     name = share.name,
-                    shuffle = true,
+                    shuffle = true
                 )
             }
             R.id.share_menu_delete -> {
@@ -235,21 +236,33 @@ class SharesFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragment
                   Visit Count: ${share.visitCount}
             """.trimIndent() +
                 (
-                    if (share.created == null) "" else """
+                    if (share.created == null) {
+                        ""
+                    } else {
+                        """
      
                   Creation Date: ${share.created!!.replace('T', ' ')}
-                    """.trimIndent()
+                        """.trimIndent()
+                    }
                     ) +
                 (
-                    if (share.lastVisited == null) "" else """
+                    if (share.lastVisited == null) {
+                        ""
+                    } else {
+                        """
      
                   Last Visited Date: ${share.lastVisited!!.replace('T', ' ')}
-                    """.trimIndent()
+                        """.trimIndent()
+                    }
                     ) +
-                if (share.expires == null) "" else """
+                if (share.expires == null) {
+                    ""
+                } else {
+                    """
      
                   Expiration Date: ${share.expires!!.replace('T', ' ')}
-                """.trimIndent()
+                    """.trimIndent()
+                }
         )
         Linkify.addLinks(message, Linkify.WEB_URLS)
         textView.text = message
@@ -289,11 +302,7 @@ class SharesFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragment
         alertDialog.show()
     }
 
-    private fun updateShareOnServer(
+    private fun updateShareOnServer(millis: Long, description: String, share: Share) {
-        millis: Long,
-        description: String,
-        share: Share
-    ) {
         launchWithToast {
             withContext(Dispatchers.IO) {
                 val musicService = MusicServiceFactory.getMusicService()

ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/CoverArtRequestHandler.kt

@@ -65,10 +65,7 @@ class CoverArtRequestHandler(private val client: SubsonicAPIClient) : RequestHan
         throw IOException("${response.apiError}")
     }
 
-    private fun getAlbumArtBitmapFromDisk(
+    private fun getAlbumArtBitmapFromDisk(filename: String, size: Int?): Bitmap? {
-        filename: String,
-        size: Int?
-    ): Bitmap? {
         val albumArtFile = FileUtil.getAlbumArtFile(filename)
         val bitmap: Bitmap? = null
         if (File(albumArtFile).exists()) {
@@ -77,11 +74,7 @@ class CoverArtRequestHandler(private val client: SubsonicAPIClient) : RequestHan
         return null
     }
 
-    private fun getBitmapFromDisk(
+    private fun getBitmapFromDisk(path: String, size: Int?, bitmap: Bitmap?): Bitmap? {
-        path: String,
-        size: Int?,
-        bitmap: Bitmap?
-    ): Bitmap? {
         var bitmap1 = bitmap
         val opt = BitmapFactory.Options()
         if (size != null && size > 0) {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt

@@ -38,7 +38,7 @@ import timber.log.Timber
 class ImageLoader(
     context: Context,
     apiClient: SubsonicAPIClient,
-    private val config: ImageLoaderConfig,
+    private val config: ImageLoaderConfig
 ) : CoroutineScope by CoroutineScope(Dispatchers.Main + SupervisorJob()) {
     private val cacheInProgress: ConcurrentHashMap<String, CountDownLatch> = ConcurrentHashMap()
 
@@ -112,7 +112,10 @@ class ImageLoader(
         val requestedSize = resolveSize(size, large)
 
         val request = ImageRequest.CoverArt(
-            id!!, cacheKey!!, null, requestedSize,
+            id!!,
+            cacheKey!!,
+            null,
+            requestedSize,
             placeHolderDrawableRes = defaultResourceId,
             errorDrawableRes = defaultResourceId
         )
@@ -157,7 +160,10 @@ class ImageLoader(
 
         if (id != null && key != null && id.isNotEmpty() && view is ImageView) {
             val request = ImageRequest.CoverArt(
-                id, key, view, requestedSize,
+                id,
+                key,
+                view,
+                requestedSize,
                 placeHolderDrawableRes = defaultResourceId,
                 errorDrawableRes = defaultResourceId
             )
@@ -170,13 +176,11 @@ class ImageLoader(
     /**
      * Load the avatar of a given user into an ImageView
      */
-    fun loadAvatarImage(
+    fun loadAvatarImage(view: ImageView, username: String) {
-        view: ImageView,
-        username: String
-    ) {
         if (username.isNotEmpty()) {
             val request = ImageRequest.Avatar(
-                username, view,
+                username,
+                view,
                 placeHolderDrawableRes = R.drawable.ic_contact_picture,
                 errorDrawableRes = R.drawable.ic_contact_picture
             )
@@ -284,7 +288,7 @@ sealed class ImageRequest(
         imageView: ImageView?,
         val size: Int,
         placeHolderDrawableRes: Int? = null,
-        errorDrawableRes: Int? = null,
+        errorDrawableRes: Int? = null
     ) : ImageRequest(
         placeHolderDrawableRes,
         errorDrawableRes,

ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/RequestCreator.kt

@@ -13,17 +13,15 @@ internal const val QUERY_USERNAME = "username"
  * Picasso.load() only accepts an URI as parameter. Therefore we create a bogus URI, in which
  * we encode the data that we need in the RequestHandler.
  */
-internal fun createLoadCoverArtRequest(entityId: String, size: Long? = 0): Uri =
+internal fun createLoadCoverArtRequest(entityId: String, size: Long? = 0): Uri = Uri.Builder()
-    Uri.Builder()
+    .scheme(SCHEME)
-        .scheme(SCHEME)
+    .appendPath(COVER_ART_PATH)
-        .appendPath(COVER_ART_PATH)
+    .appendQueryParameter(QUERY_ID, entityId)
-        .appendQueryParameter(QUERY_ID, entityId)
+    .appendQueryParameter(SIZE, size.toString())
-        .appendQueryParameter(SIZE, size.toString())
+    .build()
-        .build()
 
-internal fun createLoadAvatarRequest(username: String): Uri =
+internal fun createLoadAvatarRequest(username: String): Uri = Uri.Builder()
-    Uri.Builder()
+    .scheme(SCHEME)
-        .scheme(SCHEME)
+    .appendPath(AVATAR_PATH)
-        .appendPath(AVATAR_PATH)
+    .appendQueryParameter(QUERY_USERNAME, username)
-        .appendQueryParameter(QUERY_USERNAME, username)
+    .build()
-        .build()

ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/AlbumListModel.kt

@@ -22,11 +22,7 @@ class AlbumListModel(application: Application) : GenericListModel(application) {
     private var lastType: AlbumListType? = null
     private var loadedUntil: Int = 0
 
-    suspend fun getAlbumsOfArtist(
+    suspend fun getAlbumsOfArtist(refresh: Boolean, id: String, name: String?) {
-        refresh: Boolean,
-        id: String,
-        name: String?
-    ) {
         withContext(Dispatchers.IO) {
             val service = MusicServiceFactory.getMusicService()
             list.postValue(service.getAlbumsOfArtist(id, name, refresh))

ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/EditServerModel.kt

@@ -59,36 +59,33 @@ class EditServerModel(val app: Application) : AndroidViewModel(app), KoinCompone
         return (this.status === SubsonicResponse.Status.OK)
     }
 
-    private fun requestFlow(
+    private fun requestFlow(type: ServerFeature, api: SubsonicAPIDefinition, userName: String) =
-        type: ServerFeature,
+        flow {
-        api: SubsonicAPIDefinition,
+            when (type) {
-        userName: String
+                ServerFeature.CHAT -> emit(
-    ) = flow {
+                    serverFunctionAvailable(type, api::getChatMessagesSuspend)
-        when (type) {
+                )
-            ServerFeature.CHAT -> emit(
+                ServerFeature.BOOKMARK -> emit(
-                serverFunctionAvailable(type, api::getChatMessagesSuspend)
+                    serverFunctionAvailable(type, api::getBookmarksSuspend)
-            )
+                )
-            ServerFeature.BOOKMARK -> emit(
+                ServerFeature.SHARE -> emit(
-                serverFunctionAvailable(type, api::getBookmarksSuspend)
+                    serverFunctionAvailable(type, api::getSharesSuspend)
-            )
+                )
-            ServerFeature.SHARE -> emit(
+                ServerFeature.PODCAST -> emit(
-                serverFunctionAvailable(type, api::getSharesSuspend)
+                    serverFunctionAvailable(type, api::getPodcastsSuspend)
-            )
+                )
-            ServerFeature.PODCAST -> emit(
+                ServerFeature.JUKEBOX -> emit(
-                serverFunctionAvailable(type, api::getPodcastsSuspend)
+                    serverFunctionAvailable(type) {
-            )
+                        val response = api.getUserSuspend(userName)
-            ServerFeature.JUKEBOX -> emit(
+                        if (!response.user.jukeboxRole) throw IOException()
-                serverFunctionAvailable(type) {
+                        response
-                    val response = api.getUserSuspend(userName)
+                    }
-                    if (!response.user.jukeboxRole) throw IOException()
+                )
-                    response
+                ServerFeature.VIDEO -> emit(
-                }
+                    serverFunctionAvailable(type, api::getVideosSuspend)
-            )
+                )
-            ServerFeature.VIDEO -> emit(
+            }
-                serverFunctionAvailable(type, api::getVideosSuspend)
-            )
         }
-    }
 
     @OptIn(ExperimentalCoroutinesApi::class)
     suspend fun queryFeatureSupport(currentServerSetting: ServerSetting): Flow<FeatureSupport> {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/GenericListModel.kt

@@ -67,10 +67,7 @@ open class GenericListModel(application: Application) :
     /**
      * Trigger a load() and notify the UI that we are loading
      */
-    fun backgroundLoadFromServer(
+    fun backgroundLoadFromServer(refresh: Boolean, swipe: SwipeRefreshLayout) {
-        refresh: Boolean,
-        swipe: SwipeRefreshLayout
-    ) {
         viewModelScope.launch {
             swipe.isRefreshing = true
             loadFromServer(refresh, swipe)
@@ -81,10 +78,7 @@ open class GenericListModel(application: Application) :
     /**
      * Calls the load() function with error handling
      */
-    private suspend fun loadFromServer(
+    private suspend fun loadFromServer(refresh: Boolean, swipe: SwipeRefreshLayout) {
-        refresh: Boolean,
-        swipe: SwipeRefreshLayout
-    ) {
         withContext(Dispatchers.IO) {
             val musicService = MusicServiceFactory.getMusicService()
             val isOffline = ActiveServerProvider.isOffline()

ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/SearchListModel.kt

@@ -6,7 +6,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.moire.ultrasonic.domain.SearchCriteria
 import org.moire.ultrasonic.domain.SearchResult
-import org.moire.ultrasonic.fragment.SearchFragment
 import org.moire.ultrasonic.service.MusicServiceFactory
 import org.moire.ultrasonic.util.Settings
 
@@ -31,9 +30,9 @@ class SearchListModel(application: Application) : GenericListModel(application)
 
     fun trimResultLength(
         result: SearchResult,
-        maxArtists: Int = SearchFragment.DEFAULT_ARTISTS,
+        maxArtists: Int = Settings.defaultArtists,
-        maxAlbums: Int = SearchFragment.DEFAULT_ALBUMS,
+        maxAlbums: Int = Settings.defaultAlbums,
-        maxSongs: Int = SearchFragment.DEFAULT_SONGS
+        maxSongs: Int = Settings.defaultSongs
     ): SearchResult {
         return SearchResult(
             artists = result.artists.take(maxArtists),

ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/TrackCollectionModel.kt

@@ -30,13 +30,9 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
     private var loadedUntil: Int = 0
 
     /*
-    * Especially when dealing with indexes, this method can return Albums, Entries or a mix of both!
+     * Especially when dealing with indexes, this method can return Albums, Entries or a mix of both!
-    */
+     */
-    suspend fun getMusicDirectory(
+    suspend fun getMusicDirectory(refresh: Boolean, id: String, name: String?) {
-        refresh: Boolean,
-        id: String,
-        name: String?
-    ) {
         withContext(Dispatchers.IO) {
             val service = MusicServiceFactory.getMusicService()
             val musicDirectory = service.getMusicDirectory(id, name, refresh)
@@ -46,9 +42,7 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
     }
 
     suspend fun getAlbum(refresh: Boolean, id: String, name: String?) {
-
         withContext(Dispatchers.IO) {
-
             val service = MusicServiceFactory.getMusicService()
             val musicDirectory: MusicDirectory = service.getAlbumAsDir(id, name, refresh)
             currentListIsSortable = true
@@ -74,9 +68,7 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
     }
 
     suspend fun getStarred() {
-
         withContext(Dispatchers.IO) {
-
             val service = MusicServiceFactory.getMusicService()
             val musicDirectory: MusicDirectory
 
@@ -122,7 +114,6 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
     }
 
     suspend fun getPodcastEpisodes(podcastChannelId: String) {
-
         withContext(Dispatchers.IO) {
             val service = MusicServiceFactory.getMusicService()
             val musicDirectory = service.getPodcastEpisodes(podcastChannelId)
@@ -134,7 +125,6 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
     }
 
     suspend fun getShare(shareId: String) {
-
         withContext(Dispatchers.IO) {
             val service = MusicServiceFactory.getMusicService()
             val musicDirectory = MusicDirectory()
@@ -174,10 +164,7 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
     }
 
     @Synchronized
-    fun calculateButtonState(
+    fun calculateButtonState(selection: List<Track>, onComplete: (ButtonStates) -> Unit) {
-        selection: List<Track>,
-        onComplete: (ButtonStates) -> Unit
-    ) {
         val enabled = selection.isNotEmpty()
         var unpinEnabled = false
         var deleteEnabled = false

ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/AlbumArtContentProvider.kt

@@ -38,7 +38,9 @@ class AlbumArtContentProvider : ContentProvider(), KoinComponent {
                 .path(
                     String.format(
                         Locale.ROOT,
-                        "%s|%s", track!!.coverArt, FileUtil.getAlbumArtKey(track, true)
+                        "%s|%s",
+                        track!!.coverArt,
+                        FileUtil.getAlbumArtKey(track, true)
                     )
                 )
                 .build()

ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt

@@ -160,11 +160,7 @@ open class UltrasonicAppWidgetProvider : AppWidgetProvider() {
         /**
          * Update Track details in widgets
          */
-        private fun updateTrack(
+        private fun updateTrack(context: Context, views: RemoteViews, currentSong: Track?) {
-            context: Context,
-            views: RemoteViews,
-            currentSong: Track?
-        ) {
             Timber.d("Updating Widget")
             val res = context.resources
             val title = currentSong?.title

ultrasonic/src/main/kotlin/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.kt

@@ -45,7 +45,8 @@ class BluetoothIntentReceiver : BroadcastReceiver() {
                 connectionStatus = Constants.PREFERENCE_VALUE_ALL
             }
             BluetoothDevice.ACTION_ACL_DISCONNECTED,
-            BluetoothDevice.ACTION_ACL_DISCONNECT_REQUESTED -> {
+            BluetoothDevice.ACTION_ACL_DISCONNECT_REQUESTED
+            -> {
                 disconnectionStatus = Constants.PREFERENCE_VALUE_ALL
             }
         }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt

@@ -155,8 +155,7 @@ class CachedMusicService(private val musicService: MusicService) : MusicService,
      * Cached in the RoomDB
      */
     @Throws(Exception::class)
-    override fun getAlbumsOfArtist(id: String, name: String?, refresh: Boolean):
+    override fun getAlbumsOfArtist(id: String, name: String?, refresh: Boolean): List<Album> {
-        List<Album> {
         checkSettingsChanged()
 
         var result: List<Album>
@@ -481,11 +480,7 @@ class CachedMusicService(private val musicService: MusicService) : MusicService,
     }
 
     @Throws(Exception::class)
-    override fun createShare(
+    override fun createShare(ids: List<String>, description: String?, expires: Long?): List<Share> {
-        ids: List<String>,
-        description: String?,
-        expires: Long?
-    ): List<Share> {
         return musicService.createShare(ids, description, expires)
     }
 

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt

@@ -200,26 +200,6 @@ class DownloadService : Service(), KoinComponent {
         }
     }
 
-    private fun updateLiveData() {
-        val temp: MutableList<Track> = ArrayList()
-        temp.addAll(activeDownloads.values.map { it.downloadTrack.track })
-        temp.addAll(downloadQueue.map { x -> x.track })
-        observableDownloads.postValue(temp.distinct().sorted())
-    }
-
-    private fun clearDownloads() {
-        // Clear the pending queue
-        while (!downloadQueue.isEmpty()) {
-            postState(downloadQueue.remove().track, DownloadState.IDLE)
-        }
-        // Cancel all active downloads
-        for (download in activeDownloads) {
-            download.value.cancel()
-        }
-        activeDownloads.clear()
-        updateLiveData()
-    }
-
     // We should use a single notification builder, otherwise the notification may not be updated
     // Set some values that never change
     private val notificationBuilder: NotificationCompat.Builder by lazy {
@@ -236,7 +216,6 @@ class DownloadService : Service(), KoinComponent {
     }
 
     private fun updateNotification() {
-
         val notification = buildForegroundNotification()
 
         if (isInForeground) {
@@ -344,10 +323,27 @@ class DownloadService : Service(), KoinComponent {
             }
         }
 
-        private fun setSaveFlagForTracks(
+        private fun updateLiveData() {
-            shouldPin: Boolean,
+            val temp: MutableList<Track> = ArrayList()
-            tracks: List<Track>
+            temp.addAll(activeDownloads.values.map { it.downloadTrack.track })
-        ): List<Track> {
+            temp.addAll(downloadQueue.map { x -> x.track })
+            observableDownloads.postValue(temp.distinct().sorted())
+        }
+
+        fun clearDownloads() {
+            // Clear the pending queue
+            while (!downloadQueue.isEmpty()) {
+                postState(downloadQueue.remove().track, DownloadState.IDLE)
+            }
+            // Cancel all active downloads
+            for (download in activeDownloads) {
+                download.value.cancel()
+            }
+            activeDownloads.clear()
+            updateLiveData()
+        }
+
+        private fun setSaveFlagForTracks(shouldPin: Boolean, tracks: List<Track>): List<Track> {
             // Walk through the tracks. If a track is pinned or complete and needs to be changed
             // to the other state, rename it, but don't return it, thereby excluding it from
             // further processing.

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadState.kt

@@ -8,7 +8,15 @@
 package org.moire.ultrasonic.service
 
 enum class DownloadState {
-    IDLE, QUEUED, DOWNLOADING, RETRYING, FAILED, CANCELLED, DONE, PINNED, UNKNOWN;
+    IDLE,
+    QUEUED,
+    DOWNLOADING,
+    RETRYING,
+    FAILED,
+    CANCELLED,
+    DONE,
+    PINNED,
+    UNKNOWN;
 
     companion object {
         fun DownloadState.isFinalState(): Boolean {
@@ -17,7 +25,8 @@ enum class DownloadState {
                 FAILED,
                 CANCELLED,
                 DONE,
-                PINNED -> true
+                PINNED
+                -> true
                 else -> false
             }
         }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadTask.kt

@@ -91,7 +91,8 @@ class DownloadTask(
 
         // Attempt partial HTTP GET, appending to the file if it exists.
         val (inStream, isPartial) = musicService.getDownloadInputStream(
-            downloadTrack.track, fileLength,
+            downloadTrack.track,
+            fileLength,
             if (downloadTrack.pinned) Settings.maxBitRatePinning else Settings.maxBitRate,
             downloadTrack.pinned && Settings.pinWithHighestQuality
         )
@@ -228,8 +229,9 @@ class DownloadTask(
         }
 
         // Cache the artist
-        if (artistId != null)
+        if (artistId != null) {
             directArtist = cacheArtist(onlineDB, offlineDB, artistId)
+        }
 
         // Now cache the album
         if (albumId != null) {
@@ -246,8 +248,9 @@ class DownloadTask(
                 offlineDB.albumDao().insert(album)
 
                 // If the album is a Compilation, also cache the Album artist
-                if (album.artistId != null && album.artistId != artistId)
+                if (album.artistId != null && album.artistId != artistId) {
                     compilationArtist = cacheArtist(onlineDB, offlineDB, album.artistId!!)
+                }
             }
         }
 

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/ExternalStorageMonitor.kt

@@ -42,6 +42,10 @@ class ExternalStorageMonitor {
     }
 
     fun onDestroy() {
-        applicationContext().unregisterReceiver(ejectEventReceiver)
+        // avoid race conditions
+        try {
+            applicationContext().unregisterReceiver(ejectEventReceiver)
+        } catch (ignored: Exception) {
+        }
     }
 }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/JukeboxMediaPlayer.kt

@@ -109,8 +109,8 @@ class JukeboxMediaPlayer : JukeboxUnimplementedFunctions(), Player {
         stop()
         startProcessTasks()
     }
-    @Suppress("MagicNumber")
 
+    @Suppress("MagicNumber")
     override fun release() {
         tasks.clear()
         stop()
@@ -210,7 +210,7 @@ class JukeboxMediaPlayer : JukeboxUnimplementedFunctions(), Player {
             Player.COMMAND_GET_TIMELINE,
             Player.COMMAND_GET_DEVICE_VOLUME,
             Player.COMMAND_ADJUST_DEVICE_VOLUME_WITH_FLAGS,
-            Player.COMMAND_SET_DEVICE_VOLUME_WITH_FLAGS,
+            Player.COMMAND_SET_DEVICE_VOLUME_WITH_FLAGS
         )
         if (isPlaying) commandsBuilder.add(Player.COMMAND_STOP)
         if (playlist.isNotEmpty()) {
@@ -227,10 +227,12 @@ class JukeboxMediaPlayer : JukeboxUnimplementedFunctions(), Player {
                 Player.COMMAND_SEEK_TO_PREVIOUS,
                 Player.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM
             )
-            if (currentIndex < playlist.size - 1) commandsBuilder.addAll(
+            if (currentIndex < playlist.size - 1) {
-                Player.COMMAND_SEEK_TO_NEXT,
+                commandsBuilder.addAll(
-                Player.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM,
+                    Player.COMMAND_SEEK_TO_NEXT,
-            )
+                    Player.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM
+                )
+            }
         }
         return commandsBuilder.build()
     }
@@ -524,8 +526,11 @@ class JukeboxMediaPlayer : JukeboxUnimplementedFunctions(), Player {
             shouldUpdateCommands = true
             currentIndex = jukeboxStatus.currentPlayingIndex ?: 0
             val currentMedia =
-                if (currentIndex > 0 && currentIndex < playlist.size) playlist[currentIndex]
+                if (currentIndex > 0 && currentIndex < playlist.size) {
-                else MediaItem.EMPTY
+                    playlist[currentIndex]
+                } else {
+                    MediaItem.EMPTY
+                }
 
             Handler(Looper.getMainLooper()).post {
                 listeners.queueEvent(Player.EVENT_MEDIA_ITEM_TRANSITION) {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaLibrarySessionCallback.kt

@@ -273,8 +273,9 @@ class MediaLibrarySessionCallback :
             var lastCarConnectionType = -1
 
             CarConnection(UApp.applicationContext()).type.observeForever {
-                if (lastCarConnectionType == it)
+                if (lastCarConnectionType == it) {
                     return@observeForever
+                }
 
                 lastCarConnectionType = it
 
@@ -296,8 +297,9 @@ class MediaLibrarySessionCallback :
                         }
                 }
             }
-        } else
+        } else {
             Timber.d("Car app library not available")
+        }
     }
 
     override fun onPostConnect(session: MediaSession, controller: MediaSession.ControllerInfo) {
@@ -313,10 +315,11 @@ class MediaLibrarySessionCallback :
     private fun getHeartCommandButton(sessionCommand: SessionCommand, willHeart: Boolean) =
         CommandButton.Builder()
             .setDisplayName(
-                if (willHeart)
+                if (willHeart) {
                     "Love"
-                else
+                } else {
                     "Dislike"
+                }
             )
             .setIconResId(
                 if (willHeart)
@@ -328,13 +331,12 @@ class MediaLibrarySessionCallback :
             .setEnabled(true)
             .build()
 
-    private fun getShuffleCommandButton(sessionCommand: SessionCommand) =
+    private fun getShuffleCommandButton(sessionCommand: SessionCommand) = CommandButton.Builder()
-        CommandButton.Builder()
+        .setDisplayName("Shuffle")
-            .setDisplayName("Shuffle")
+        .setIconResId(R.drawable.media_shuffle)
-            .setIconResId(R.drawable.media_shuffle)
+        .setSessionCommand(sessionCommand)
-            .setSessionCommand(sessionCommand)
+        .setEnabled(true)
-            .setEnabled(true)
+        .build()
-            .build()
 
     private fun getPlaceholderButton() = CommandButton.Builder()
         .setDisplayName("Placeholder")
@@ -514,22 +516,23 @@ class MediaLibrarySessionCallback :
         controller: MediaSession.ControllerInfo,
         mediaItems: MutableList<MediaItem>
     ): ListenableFuture<List<MediaItem>> {
-
         Timber.i("onAddMediaItems")
 
         if (mediaItems.isEmpty()) return Futures.immediateFuture(mediaItems)
         // Return early if its a search
-        if (mediaItems[0].requestMetadata.searchQuery != null)
+        if (mediaItems[0].requestMetadata.searchQuery != null) {
             return playFromSearch(mediaItems[0].requestMetadata.searchQuery!!)
+        }
 
         val updatedMediaItems: List<MediaItem> =
             mediaItems.mapNotNull { mediaItem ->
-                if (mediaItem.requestMetadata.mediaUri != null)
+                if (mediaItem.requestMetadata.mediaUri != null) {
                     mediaItem.buildUpon()
                         .setUri(mediaItem.requestMetadata.mediaUri)
                         .build()
-                else
+                } else {
                     null
+                }
             }
 
         return if (updatedMediaItems.isNotEmpty()) {
@@ -552,12 +555,16 @@ class MediaLibrarySessionCallback :
         val tracks = when (mediaIdParts.first()) {
             MEDIA_PLAYLIST_ITEM -> playPlaylist(mediaIdParts[1], mediaIdParts[2])
             MEDIA_PLAYLIST_SONG_ITEM -> playPlaylistSong(
-                mediaIdParts[1], mediaIdParts[2], mediaIdParts[3]
+                mediaIdParts[1],
+                mediaIdParts[2],
+                mediaIdParts[3]
             )
 
             MEDIA_ALBUM_ITEM -> playAlbum(mediaIdParts[1], mediaIdParts[2])
             MEDIA_ALBUM_SONG_ITEM -> playAlbumSong(
-                mediaIdParts[1], mediaIdParts[2], mediaIdParts[3]
+                mediaIdParts[1],
+                mediaIdParts[2],
+                mediaIdParts[3]
             )
 
             MEDIA_SONG_STARRED_ID -> playStarredSongs()
@@ -569,7 +576,8 @@ class MediaLibrarySessionCallback :
             MEDIA_BOOKMARK_ITEM -> playBookmark(mediaIdParts[1])
             MEDIA_PODCAST_ITEM -> playPodcast(mediaIdParts[1])
             MEDIA_PODCAST_EPISODE_ITEM -> playPodcastEpisode(
-                mediaIdParts[1], mediaIdParts[2]
+                mediaIdParts[1],
+                mediaIdParts[2]
             )
 
             MEDIA_SEARCH_SONG_ITEM -> playSearch(mediaIdParts[1])
@@ -588,7 +596,7 @@ class MediaLibrarySessionCallback :
 
     @Suppress("ReturnCount", "ComplexMethod")
     private fun onLoadChildren(
-        parentId: String,
+        parentId: String
     ): ListenableFuture<LibraryResult<ImmutableList<MediaItem>>> {
         Timber.d("AutoMediaBrowserService onLoadChildren called. ParentId: %s", parentId)
 
@@ -601,7 +609,8 @@ class MediaLibrarySessionCallback :
             MEDIA_ARTIST_SECTION -> getArtists(parentIdParts[1])
             MEDIA_ALBUM_ID -> getAlbums(AlbumListType.SORTED_BY_NAME)
             MEDIA_ALBUM_PAGE_ID -> getAlbums(
-                AlbumListType.fromName(parentIdParts[1]), parentIdParts[2].toInt()
+                AlbumListType.fromName(parentIdParts[1]),
+                parentIdParts[2].toInt()
             )
 
             MEDIA_PLAYLIST_ID -> getPlaylists()
@@ -617,7 +626,8 @@ class MediaLibrarySessionCallback :
             MEDIA_PODCAST_ID -> getPodcasts()
             MEDIA_PLAYLIST_ITEM -> getPlaylist(parentIdParts[1], parentIdParts[2])
             MEDIA_ARTIST_ITEM -> getAlbumsForArtist(
-                parentIdParts[1], parentIdParts[2]
+                parentIdParts[1],
+                parentIdParts[2]
             )
 
             MEDIA_ALBUM_ITEM -> getSongsForAlbum(parentIdParts[1], parentIdParts[2])
@@ -627,10 +637,7 @@ class MediaLibrarySessionCallback :
         }
     }
 
-    private fun playFromSearch(
+    private fun playFromSearch(query: String): ListenableFuture<List<MediaItem>> {
-        query: String,
-    ): ListenableFuture<List<MediaItem>> {
-
         Timber.w("App state: %s", UApp.instance != null)
 
         Timber.i("AutoMediaBrowserService onSearch query: %s", query)
@@ -651,7 +658,6 @@ class MediaLibrarySessionCallback :
 
             // TODO Add More... button to categories
             if (searchResult != null) {
-
                 searchResult.albums.map { album ->
                     mediaItems.add(
                         album.title ?: "",
@@ -704,12 +710,16 @@ class MediaLibrarySessionCallback :
         return when (mediaIdParts.first()) {
             MEDIA_PLAYLIST_ITEM -> playPlaylist(mediaIdParts[1], mediaIdParts[2])
             MEDIA_PLAYLIST_SONG_ITEM -> playPlaylistSong(
-                mediaIdParts[1], mediaIdParts[2], mediaIdParts[3]
+                mediaIdParts[1],
+                mediaIdParts[2],
+                mediaIdParts[3]
             )
 
             MEDIA_ALBUM_ITEM -> playAlbum(mediaIdParts[1], mediaIdParts[2])
             MEDIA_ALBUM_SONG_ITEM -> playAlbumSong(
-                mediaIdParts[1], mediaIdParts[2], mediaIdParts[3]
+                mediaIdParts[1],
+                mediaIdParts[2],
+                mediaIdParts[3]
             )
 
             MEDIA_SONG_STARRED_ID -> playStarredSongs()
@@ -721,7 +731,8 @@ class MediaLibrarySessionCallback :
             MEDIA_BOOKMARK_ITEM -> playBookmark(mediaIdParts[1])
             MEDIA_PODCAST_ITEM -> playPodcast(mediaIdParts[1])
             MEDIA_PODCAST_EPISODE_ITEM -> playPodcastEpisode(
-                mediaIdParts[1], mediaIdParts[2]
+                mediaIdParts[1],
+                mediaIdParts[2]
             )
 
             MEDIA_SEARCH_SONG_ITEM -> playSearch(mediaIdParts[1])
@@ -743,7 +754,7 @@ class MediaLibrarySessionCallback :
     private fun getRootItems(): ListenableFuture<LibraryResult<ImmutableList<MediaItem>>> {
         val mediaItems: MutableList<MediaItem> = ArrayList()
 
-        if (!isOffline)
+        if (!isOffline) {
             mediaItems.add(
                 R.string.music_library_label,
                 MEDIA_LIBRARY_ID,
@@ -752,6 +763,7 @@ class MediaLibrarySessionCallback :
                 mediaType = MEDIA_TYPE_FOLDER_MIXED,
                 icon = R.drawable.ic_library
             )
+        }
 
         mediaItems.add(
             R.string.main_artists_title,
@@ -762,7 +774,7 @@ class MediaLibrarySessionCallback :
             icon = R.drawable.ic_artist
         )
 
-        if (!isOffline)
+        if (!isOffline) {
             mediaItems.add(
                 R.string.main_albums_title,
                 MEDIA_ALBUM_ID,
@@ -771,6 +783,7 @@ class MediaLibrarySessionCallback :
                 mediaType = MEDIA_TYPE_FOLDER_ALBUMS,
                 icon = R.drawable.ic_menu_browse
             )
+        }
 
         mediaItems.add(
             R.string.playlist_label,
@@ -815,28 +828,28 @@ class MediaLibrarySessionCallback :
             R.string.main_albums_recent,
             MEDIA_ALBUM_RECENT_ID,
             R.string.main_albums_title,
-            mediaType = MEDIA_TYPE_FOLDER_ALBUMS,
+            mediaType = MEDIA_TYPE_FOLDER_ALBUMS
         )
 
         mediaItems.add(
             R.string.main_albums_frequent,
             MEDIA_ALBUM_FREQUENT_ID,
             R.string.main_albums_title,
-            mediaType = MEDIA_TYPE_FOLDER_ALBUMS,
+            mediaType = MEDIA_TYPE_FOLDER_ALBUMS
         )
 
         mediaItems.add(
             R.string.main_albums_random,
             MEDIA_ALBUM_RANDOM_ID,
             R.string.main_albums_title,
-            mediaType = MEDIA_TYPE_FOLDER_ALBUMS,
+            mediaType = MEDIA_TYPE_FOLDER_ALBUMS
         )
 
         mediaItems.add(
             R.string.main_albums_starred,
             MEDIA_ALBUM_STARRED_ID,
             R.string.main_albums_title,
-            mediaType = MEDIA_TYPE_FOLDER_ALBUMS,
+            mediaType = MEDIA_TYPE_FOLDER_ALBUMS
         )
 
         // Other
@@ -869,10 +882,11 @@ class MediaLibrarySessionCallback :
             }.await()
 
             if (artists != null) {
-                if (section != null)
+                if (section != null) {
                     artists = artists.filter { artist ->
                         getSectionFromName(artist.name ?: "") == section
                     }
+                }
 
                 // If there are too many artists, create alphabetic index of them
                 if (section == null && artists.count() > DISPLAY_LIMIT) {
@@ -942,28 +956,30 @@ class MediaLibrarySessionCallback :
             if (songs != null) {
                 if (songs.getChildren(includeDirs = true, includeFiles = false).isEmpty() &&
                     songs.getChildren(includeDirs = false, includeFiles = true).isNotEmpty()
-                )
+                ) {
                     mediaItems.addPlayAllItem(listOf(MEDIA_ALBUM_ITEM, id, name).joinToString("|"))
+                }
 
                 // TODO: Paging is not implemented for songs, is it necessary at all?
                 val items = songs.getChildren().take(DISPLAY_LIMIT).toMutableList()
 
                 items.sortWith { o1, o2 ->
-                    if (o1.isDirectory && o2.isDirectory)
+                    if (o1.isDirectory && o2.isDirectory) {
                         (o1.title ?: "").compareTo(o2.title ?: "")
-                    else if (o1.isDirectory)
+                    } else if (o1.isDirectory) {
                         -1
-                    else
+                    } else {
                         1
+                    }
                 }
 
                 items.map { item ->
-                    if (item.isDirectory)
+                    if (item.isDirectory) {
                         mediaItems.add(
                             item.title ?: "",
                             listOf(MEDIA_ALBUM_ITEM, item.id, item.name).joinToString("|")
                         )
-                    else if (item is Track)
+                    } else if (item is Track) {
                         mediaItems.add(
                             item.toMediaItem(
                                 listOf(
@@ -974,6 +990,7 @@ class MediaLibrarySessionCallback :
                                 ).joinToString("|")
                             )
                         )
+                    }
                 }
             }
 
@@ -994,13 +1011,19 @@ class MediaLibrarySessionCallback :
                 if (ActiveServerProvider.shouldUseId3Tags()) {
                     callWithErrorHandling {
                         musicService.getAlbumList2(
-                            type, DISPLAY_LIMIT, offset, null
+                            type,
+                            DISPLAY_LIMIT,
+                            offset,
+                            null
                         )
                     }
                 } else {
                     callWithErrorHandling {
                         musicService.getAlbumList(
-                            type, DISPLAY_LIMIT, offset, null
+                            type,
+                            DISPLAY_LIMIT,
+                            offset,
+                            null
                         )
                     }
                 }
@@ -1014,12 +1037,13 @@ class MediaLibrarySessionCallback :
                 )
             }
 
-            if ((albums?.size ?: 0) >= DISPLAY_LIMIT)
+            if ((albums?.size ?: 0) >= DISPLAY_LIMIT) {
                 mediaItems.add(
                     R.string.search_more,
                     listOf(MEDIA_ALBUM_PAGE_ID, type.typeName, (page ?: 0) + 1).joinToString("|"),
                     null
                 )
+            }
 
             return@future LibraryResult.ofItemList(mediaItems, null)
         }
@@ -1038,7 +1062,7 @@ class MediaLibrarySessionCallback :
                     playlist.name,
                     listOf(MEDIA_PLAYLIST_ITEM, playlist.id, playlist.name)
                         .joinToString("|"),
-                    mediaType = MEDIA_TYPE_PLAYLIST,
+                    mediaType = MEDIA_TYPE_PLAYLIST
                 )
             }
             return@future LibraryResult.ofItemList(mediaItems, null)
@@ -1047,7 +1071,7 @@ class MediaLibrarySessionCallback :
 
     private fun getPlaylist(
         id: String,
-        name: String,
+        name: String
     ): ListenableFuture<LibraryResult<ImmutableList<MediaItem>>> {
         val mediaItems: MutableList<MediaItem> = ArrayList()
 
@@ -1057,10 +1081,11 @@ class MediaLibrarySessionCallback :
             }.await()
 
             if (content != null) {
-                if (content.size > 1)
+                if (content.size > 1) {
                     mediaItems.addPlayAllItem(
                         listOf(MEDIA_PLAYLIST_ITEM, id, name).joinToString("|")
                     )
+                }
 
                 // Playlist should be cached as it may contain random elements
                 playlistCache = content.getTracks()
@@ -1132,7 +1157,7 @@ class MediaLibrarySessionCallback :
                 mediaItems.add(
                     podcast.title ?: "",
                     listOf(MEDIA_PODCAST_ITEM, podcast.id).joinToString("|"),
-                    mediaType = MEDIA_TYPE_FOLDER_MIXED,
+                    mediaType = MEDIA_TYPE_FOLDER_MIXED
                 )
             }
             return@future LibraryResult.ofItemList(mediaItems, null)
@@ -1149,8 +1174,9 @@ class MediaLibrarySessionCallback :
             }.await()
 
             if (episodes != null) {
-                if (episodes.getTracks().count() > 1)
+                if (episodes.getTracks().count() > 1) {
                     mediaItems.addPlayAllItem(listOf(MEDIA_PODCAST_ITEM, id).joinToString("|"))
+                }
 
                 episodes.getTracks().map { episode ->
                     mediaItems.add(
@@ -1235,7 +1261,7 @@ class MediaLibrarySessionCallback :
                     share.name ?: "",
                     listOf(MEDIA_SHARE_ITEM, share.id)
                         .joinToString("|"),
-                    mediaType = MEDIA_TYPE_FOLDER_MIXED,
+                    mediaType = MEDIA_TYPE_FOLDER_MIXED
                 )
             }
             return@future LibraryResult.ofItemList(mediaItems, null)
@@ -1254,9 +1280,9 @@ class MediaLibrarySessionCallback :
 
             val selectedShare = shares?.firstOrNull { share -> share.id == id }
             if (selectedShare != null) {
-
+                if (selectedShare.getEntries().count() > 1) {
-                if (selectedShare.getEntries().count() > 1)
                     mediaItems.addPlayAllItem(listOf(MEDIA_SHARE_ITEM, id).joinToString("|"))
+                }
 
                 selectedShare.getEntries().map { song ->
                     mediaItems.add(
@@ -1302,8 +1328,9 @@ class MediaLibrarySessionCallback :
             }.await()
 
             if (songs != null) {
-                if (songs.songs.count() > 1)
+                if (songs.songs.count() > 1) {
                     mediaItems.addPlayAllItem(listOf(MEDIA_SONG_STARRED_ID).joinToString("|"))
+                }
 
                 // TODO: Paging is not implemented for songs, is it necessary at all?
                 val items = songs.songs.take(DISPLAY_LIMIT)
@@ -1350,8 +1377,9 @@ class MediaLibrarySessionCallback :
             }.await()
 
             if (songs != null) {
-                if (songs.size > 1)
+                if (songs.size > 1) {
                     mediaItems.addPlayAllItem(listOf(MEDIA_SONG_RANDOM_ID).joinToString("|"))
+                }
 
                 // TODO: Paging is not implemented for songs, is it necessary at all?
                 val items = songs.getTracks()
@@ -1416,7 +1444,6 @@ class MediaLibrarySessionCallback :
         mediaType: Int = MEDIA_TYPE_MIXED,
         isBrowsable: Boolean = false
     ) {
-
         val mediaItem = buildMediaItem(
             title,
             mediaId,
@@ -1446,19 +1473,21 @@ class MediaLibrarySessionCallback :
             isBrowsable = isBrowsable,
             imageUri = if (icon != null) {
                 Util.getUriToDrawable(applicationContext, icon)
-            } else null,
+            } else {
+                null
+            },
             group = if (groupNameId != null) {
                 applicationContext.getString(groupNameId)
-            } else null,
+            } else {
+                null
+            },
             mediaType = mediaType
         )
 
         this.add(mediaItem)
     }
 
-    private fun MutableList<MediaItem>.addPlayAllItem(
+    private fun MutableList<MediaItem>.addPlayAllItem(mediaId: String) {
-        mediaId: String,
-    ) {
         this.add(
             R.string.select_album_play_all,
             mediaId,
@@ -1513,8 +1542,7 @@ class MediaLibrarySessionCallback :
         }
     }
 
-    private fun MediaSession.canShuffle() =
+    private fun MediaSession.canShuffle() = player.mediaItemCount > 2
-        player.mediaItemCount > 2
 
     private fun MediaSession.buildCustomCommands(
         isHeart: Boolean = false,
@@ -1531,22 +1559,25 @@ class MediaLibrarySessionCallback :
                 if (
                     player.repeatMode != Player.REPEAT_MODE_ALL &&
                     player.currentMediaItemIndex == player.mediaItemCount - 1
-                )
+                ) {
                     add(placeholderButton)
+                }
 
                 // due to the previous placeholder this heart button will always appear to the left
                 // of the default playback items
                 add(
-                    if (isHeart)
+                    if (isHeart) {
                         heartButtonToggleOff
-                    else
+                    } else {
                         heartButtonToggleOn
+                    }
                 )
 
                 // both the shuffle and the active repeat mode button will end up in the overflow
                 // menu if both are available at the same time
-                if (canShuffle)
+                if (canShuffle) {
                     add(shuffleButton)
+                }
 
                 add(
                     when (player.repeatMode) {
@@ -1564,8 +1595,9 @@ class MediaLibrarySessionCallback :
 
         // 3 was chosen because that leaves at least two other songs to be shuffled around
         @Suppress("MagicNumber")
-        if (player.mediaItemCount < 3)
+        if (player.mediaItemCount < 3) {
             return
+        }
 
         val mediaItemsToShuffle = mutableListOf<MediaItem>()
 

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.kt

@@ -58,7 +58,6 @@ class MediaPlayerLifecycleSupport(
     }
 
     private fun onCreate(autoPlay: Boolean, afterRestore: Runnable?) {
-
         if (created) {
             afterRestore?.run()
             return
@@ -87,7 +86,6 @@ class MediaPlayerLifecycleSupport(
     }
 
     private fun onDestroy() {
-
         if (!created) return
         rxBusSubscription.dispose()
 
@@ -100,7 +98,6 @@ class MediaPlayerLifecycleSupport(
     }
 
     fun receiveIntent(intent: Intent?) {
-
         if (intent == null) return
 
         val intentAction = intent.action
@@ -130,7 +127,6 @@ class MediaPlayerLifecycleSupport(
      * while Ultrasonic is running.
      */
     private fun registerHeadsetReceiver() {
-
         headsetEventReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context, intent: Intent) {
                 val extras = intent.extras ?: return
@@ -161,7 +157,6 @@ class MediaPlayerLifecycleSupport(
 
     @Suppress("MagicNumber", "ComplexMethod")
     private fun handleKeyEvent(event: KeyEvent) {
-
         if (event.action != KeyEvent.ACTION_DOWN || event.repeatCount > 0) return
 
         val keyCode: Int = event.keyCode
@@ -177,7 +172,8 @@ class MediaPlayerLifecycleSupport(
         onCreate(autoStart) {
             when (keyCode) {
                 KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE,
-                KeyEvent.KEYCODE_HEADSETHOOK -> mediaPlayerManager.togglePlayPause()
+                KeyEvent.KEYCODE_HEADSETHOOK
+                -> mediaPlayerManager.togglePlayPause()
                 KeyEvent.KEYCODE_MEDIA_PREVIOUS -> mediaPlayerManager.seekToPrevious()
                 KeyEvent.KEYCODE_MEDIA_NEXT -> mediaPlayerManager.seekToNext()
                 KeyEvent.KEYCODE_MEDIA_STOP -> mediaPlayerManager.stop()
@@ -200,12 +196,12 @@ class MediaPlayerLifecycleSupport(
      */
     @Suppress("ComplexMethod")
     private fun handleUltrasonicIntent(action: String) {
-
         val isRunning = created
 
         // If Ultrasonic is not running, do nothing to stop or pause
-        if (!isRunning && (action == Constants.CMD_PAUSE || action == Constants.CMD_STOP))
+        if (!isRunning && (action == Constants.CMD_PAUSE || action == Constants.CMD_STOP)) {
             return
+        }
 
         val autoStart = action == Constants.CMD_PLAY ||
             action == Constants.CMD_RESUME_OR_PLAY ||

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerManager.kt

@@ -333,10 +333,7 @@ class MediaPlayerManager(
     }
 
     @Synchronized
-    fun restore(
+    fun restore(state: PlaybackState, autoPlay: Boolean) {
-        state: PlaybackState,
-        autoPlay: Boolean
-    ) {
         val insertionMode = InsertionMode.APPEND
 
         addToPlaylist(
@@ -406,7 +403,9 @@ class MediaPlayerManager(
         // This case would throw an exception in Media3. It can happen when an inconsistent state is saved.
         if (controller?.currentTimeline?.isEmpty != false ||
             index >= controller!!.currentTimeline.windowCount
-        ) return
+        ) {
+            return
+        }
 
         Timber.i("SeekTo: %s %s", index, position)
         controller?.seekTo(index, position.toLong())
@@ -509,9 +508,7 @@ class MediaPlayerManager(
         shuffle: Boolean = false,
         isArtist: Boolean = false
     ) {
-
         fragment.launchWithToast {
-
             val list: List<Track> =
                 tracks.ifEmpty {
                     requireNotNull(id)
@@ -522,7 +519,7 @@ class MediaPlayerManager(
                 songs = list,
                 insertionMode = insertionMode,
                 autoPlay = (insertionMode == InsertionMode.CLEAR),
-                shuffle = shuffle,
+                shuffle = shuffle
             )
 
             if (insertionMode == InsertionMode.CLEAR) {
@@ -537,10 +534,11 @@ class MediaPlayerManager(
                     quantize(R.plurals.n_songs_added_to_end, list)
 
                 InsertionMode.CLEAR -> {
-                    if (Settings.shouldTransitionOnPlayback)
+                    if (Settings.shouldTransitionOnPlayback) {
                         null
-                    else
+                    } else {
                         quantize(R.plurals.n_songs_added_play_now, list)
+                    }
                 }
             }
         }
@@ -593,12 +591,15 @@ class MediaPlayerManager(
     @Synchronized
     @JvmOverloads
     fun clear(serialize: Boolean = true) {
-
         controller?.clearMediaItems()
 
         if (controller != null && serialize) {
             playbackStateSerializer.serializeAsync(
-                listOf(), -1, 0, isShufflePlayEnabled, repeatMode
+                listOf(),
+                -1,
+                0,
+                isShufflePlayEnabled,
+                repeatMode
             )
         }
     }
@@ -739,8 +740,8 @@ class MediaPlayerManager(
     }
 
     /*
-    * Sets the rating of the current track
+     * Sets the rating of the current track
-    */
+     */
     private fun setRating(rating: Rating) {
         if (controller is MediaController) {
             (controller as MediaController).setRating(rating)
@@ -748,9 +749,9 @@ class MediaPlayerManager(
     }
 
     /*
-    * This legacy function simply emits a rating update,
+     * This legacy function simply emits a rating update,
-    * which will then be processed by both the RatingManager as well as the controller
+     * which will then be processed by both the RatingManager as well as the controller
-    */
+     */
     fun legacyToggleStar() {
         if (currentMediaItem == null) return
         val track = currentMediaItem!!.toTrack()
@@ -886,7 +887,9 @@ class MediaPlayerManager(
     }
 
     enum class InsertionMode {
-        CLEAR, APPEND, AFTER_CURRENT
+        CLEAR,
+        APPEND,
+        AFTER_CURRENT
     }
 
     enum class PlayerBackend { JUKEBOX, LOCAL }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt

@@ -27,7 +27,6 @@ import org.moire.ultrasonic.domain.Track
 import org.moire.ultrasonic.domain.UserInfo
 
 @Suppress("TooManyFunctions")
-
 interface MusicService {
     @Throws(Exception::class)
     fun ping()

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt

@@ -113,13 +113,9 @@ class OfflineMusicService : MusicService, KoinComponent {
     }
 
     /*
-    * Especially when dealing with indexes, this method can return Albums, Entries or a mix of both!
+     * Especially when dealing with indexes, this method can return Albums, Entries or a mix of both!
-    */
+     */
-    override fun getMusicDirectory(
+    override fun getMusicDirectory(id: String, name: String?, refresh: Boolean): MusicDirectory {
-        id: String,
-        name: String?,
-        refresh: Boolean
-    ): MusicDirectory {
         val dir = Storage.getFromPath(id)
         val result = MusicDirectory()
         result.name = dir?.name ?: return result
@@ -353,6 +349,7 @@ class OfflineMusicService : MusicService, KoinComponent {
     override fun stopJukebox(): JukeboxStatus {
         throw OfflineException("Jukebox not available in offline mode")
     }
+
     @Throws(Exception::class)
     override fun clearJukebox(): JukeboxStatus {
         throw OfflineException("Jukebox not available in offline mode")
@@ -394,11 +391,7 @@ class OfflineMusicService : MusicService, KoinComponent {
     }
 
     @Throws(Exception::class)
-    override fun createShare(
+    override fun createShare(ids: List<String>, description: String?, expires: Long?): List<Share> {
-        ids: List<String>,
-        description: String?,
-        expires: Long?
-    ): List<Share> {
         throw OfflineException("Creating shares not available in offline mode")
     }
 
@@ -498,7 +491,6 @@ class OfflineMusicService : MusicService, KoinComponent {
 
     @Throws(OfflineException::class)
     override fun getAlbumAsDir(id: String, name: String?, refresh: Boolean): MusicDirectory {
-
         Timber.i("Starting album query...")
 
         val list = cachedTracks
@@ -637,10 +629,11 @@ class OfflineMusicService : MusicService, KoinComponent {
 
         val slashIndex = string.indexOf('/')
 
-        return if (slashIndex > 0)
+        return if (slashIndex > 0) {
             string.substring(0, slashIndex).toIntOrNull()
-        else
+        } else {
             string.toIntOrNull()
+        }
     }
 
     /*
@@ -651,10 +644,11 @@ class OfflineMusicService : MusicService, KoinComponent {
 
         val duration: Long? = string.toLongOrNull()
 
-        return if (duration != null)
+        return if (duration != null) {
             TimeUnit.MILLISECONDS.toSeconds(duration).toInt()
-        else
+        } else {
             null
+        }
     }
 
     // TODO: Simplify this deeply nested and complicated function

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackService.kt

@@ -240,8 +240,9 @@ class PlaybackService :
         // Create a renderer with HW rendering support
         val renderer = DefaultRenderersFactory(this)
 
-        if (Settings.useHwOffload)
+        if (Settings.useHwOffload) {
             renderer.setEnableAudioOffload(true)
+        }
 
         // Create the player
         val player = ExoPlayer.Builder(this)
@@ -258,8 +259,9 @@ class PlaybackService :
         equalizer = EqualizerController.create(player.audioSessionId)
 
         // Enable audio offload
-        if (Settings.useHwOffload)
+        if (Settings.useHwOffload) {
             player.experimentalSetOffloadSchedulingEnabled(true)
+        }
 
         return player
     }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackState.kt

@@ -25,6 +25,6 @@ fun PlaybackState.toMediaItemsWithStartPosition(): MediaSession.MediaItemsWithSt
     return MediaSession.MediaItemsWithStartPosition(
         songs.map { it.toMediaItem() },
         currentPlayingIndex,
-        currentPlayingPosition.toLong(),
+        currentPlayingPosition.toLong()
     )
 }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackStateSerializer.kt

@@ -101,7 +101,6 @@ class PlaybackStateSerializer : KoinComponent {
     }
 
     fun deserializeNow(): PlaybackState? {
-
         val state = FileUtil.deserialize<PlaybackState>(
             context, Constants.FILENAME_PLAYLIST_SER
         ) ?: return null

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaylistTimeline.kt

@@ -59,11 +59,17 @@ class PlaylistTimeline @JvmOverloads constructor(
             return windowIndex
         }
         if (windowIndex == getLastWindowIndex(shuffleModeEnabled)) {
-            return if (repeatMode == Player.REPEAT_MODE_ALL) getFirstWindowIndex(shuffleModeEnabled)
+            return if (repeatMode == Player.REPEAT_MODE_ALL) {
-            else C.INDEX_UNSET
+                getFirstWindowIndex(shuffleModeEnabled)
+            } else {
+                C.INDEX_UNSET
+            }
+        }
+        return if (shuffleModeEnabled) {
+            shuffledIndices[indicesInShuffled[windowIndex] + 1]
+        } else {
+            windowIndex + 1
         }
-        return if (shuffleModeEnabled) shuffledIndices[indicesInShuffled[windowIndex] + 1]
-        else windowIndex + 1
     }
 
     override fun getPreviousWindowIndex(
@@ -75,11 +81,17 @@ class PlaylistTimeline @JvmOverloads constructor(
             return windowIndex
         }
         if (windowIndex == getFirstWindowIndex(shuffleModeEnabled)) {
-            return if (repeatMode == Player.REPEAT_MODE_ALL) getLastWindowIndex(shuffleModeEnabled)
+            return if (repeatMode == Player.REPEAT_MODE_ALL) {
-            else C.INDEX_UNSET
+                getLastWindowIndex(shuffleModeEnabled)
+            } else {
+                C.INDEX_UNSET
+            }
+        }
+        return if (shuffleModeEnabled) {
+            shuffledIndices[indicesInShuffled[windowIndex] - 1]
+        } else {
+            windowIndex - 1
         }
-        return if (shuffleModeEnabled) shuffledIndices[indicesInShuffled[windowIndex] - 1]
-        else windowIndex - 1
     }
 
     override fun getLastWindowIndex(shuffleModeEnabled: Boolean): Int {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt

@@ -72,9 +72,7 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun getMusicFolders(
+    override fun getMusicFolders(refresh: Boolean): List<MusicFolder> {
-        refresh: Boolean
-    ): List<MusicFolder> {
         val response = API.getMusicFolders().execute().throwOnFailure()
 
         return response.body()!!.musicFolders.toDomainEntityList(activeServerId)
@@ -84,10 +82,7 @@ open class RESTMusicService(
      *  Retrieves the artists for a given music folder     *
      */
     @Throws(Exception::class)
-    override fun getIndexes(
+    override fun getIndexes(musicFolderId: String?, refresh: Boolean): List<Index> {
-        musicFolderId: String?,
-        refresh: Boolean
-    ): List<Index> {
         val response = API.getIndexes(musicFolderId, null).execute().throwOnFailure()
 
         return response.body()!!.indexes.toIndexList(
@@ -97,88 +92,57 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun getArtists(
+    override fun getArtists(refresh: Boolean): List<Artist> {
-        refresh: Boolean
-    ): List<Artist> {
         val response = API.getArtists(null).execute().throwOnFailure()
 
         return response.body()!!.indexes.toArtistList(activeServerId)
     }
 
     @Throws(Exception::class)
-    override fun star(
+    override fun star(id: String?, albumId: String?, artistId: String?) {
-        id: String?,
-        albumId: String?,
-        artistId: String?
-    ) {
         API.star(id, albumId, artistId).execute().throwOnFailure()
     }
 
     @Throws(Exception::class)
-    override fun unstar(
+    override fun unstar(id: String?, albumId: String?, artistId: String?) {
-        id: String?,
-        albumId: String?,
-        artistId: String?
-    ) {
         API.unstar(id, albumId, artistId).execute().throwOnFailure()
     }
 
     @Throws(Exception::class)
-    override fun setRating(
+    override fun setRating(id: String, rating: Int) {
-        id: String,
-        rating: Int
-    ) {
         API.setRating(id, rating).execute().throwOnFailure()
     }
 
     @Throws(Exception::class)
-    override fun getMusicDirectory(
+    override fun getMusicDirectory(id: String, name: String?, refresh: Boolean): MusicDirectory {
-        id: String,
-        name: String?,
-        refresh: Boolean
-    ): MusicDirectory {
         val response = API.getMusicDirectory(id).execute().throwOnFailure()
 
         return response.body()!!.musicDirectory.toDomainEntity(activeServerId)
     }
 
     @Throws(Exception::class)
-    override fun getAlbumsOfArtist(
+    override fun getAlbumsOfArtist(id: String, name: String?, refresh: Boolean): List<Album> {
-        id: String,
-        name: String?,
-        refresh: Boolean
-    ): List<Album> {
         val response = API.getArtist(id).execute().throwOnFailure()
 
         return response.body()!!.artist.toDomainEntityList(activeServerId)
     }
 
     @Throws(Exception::class)
-    override fun getAlbumAsDir(
+    override fun getAlbumAsDir(id: String, name: String?, refresh: Boolean): MusicDirectory {
-        id: String,
-        name: String?,
-        refresh: Boolean
-    ): MusicDirectory {
         val response = API.getAlbum(id).execute().throwOnFailure()
 
         return response.body()!!.album.toMusicDirectoryDomainEntity(activeServerId)
     }
 
     @Throws(Exception::class)
-    override fun getAlbum(
+    override fun getAlbum(id: String, name: String?, refresh: Boolean): Album {
-        id: String,
-        name: String?,
-        refresh: Boolean
-    ): Album {
         val response = API.getAlbum(id).execute().throwOnFailure()
 
         return response.body()!!.album.toDomainEntity(activeServerId)
     }
 
     @Throws(Exception::class)
-    override fun search(
+    override fun search(criteria: SearchCriteria): SearchResult {
-        criteria: SearchCriteria
-    ): SearchResult {
         return try {
             if (shouldUseId3Tags()) {
                 search3(criteria)
@@ -195,9 +159,7 @@ open class RESTMusicService(
      * Search using the "search" REST method.
      */
     @Throws(Exception::class)
-    private fun searchOld(
+    private fun searchOld(criteria: SearchCriteria): SearchResult {
-        criteria: SearchCriteria
-    ): SearchResult {
         val response =
             API.search(null, null, null, criteria.query, criteria.songCount, null, null)
                 .execute().throwOnFailure()
@@ -209,36 +171,39 @@ open class RESTMusicService(
      * Search using the "search2" REST method, available in 1.4.0 and later.
      */
     @Throws(Exception::class)
-    private fun search2(
+    private fun search2(criteria: SearchCriteria): SearchResult {
-        criteria: SearchCriteria
-    ): SearchResult {
         requireNotNull(criteria.query) { "Query param is null" }
         val response = API.search2(
-            criteria.query, criteria.artistCount, null, criteria.albumCount, null,
+            criteria.query,
-            criteria.songCount, null
+            criteria.artistCount,
+            null,
+            criteria.albumCount,
+            null,
+            criteria.songCount,
+            null
         ).execute().throwOnFailure()
 
         return response.body()!!.searchResult.toDomainEntity(activeServerId)
     }
 
     @Throws(Exception::class)
-    private fun search3(
+    private fun search3(criteria: SearchCriteria): SearchResult {
-        criteria: SearchCriteria
-    ): SearchResult {
         requireNotNull(criteria.query) { "Query param is null" }
         val response = API.search3(
-            criteria.query, criteria.artistCount, null, criteria.albumCount, null,
+            criteria.query,
-            criteria.songCount, null
+            criteria.artistCount,
+            null,
+            criteria.albumCount,
+            null,
+            criteria.songCount,
+            null
         ).execute().throwOnFailure()
 
         return response.body()!!.searchResult.toDomainEntity(activeServerId)
     }
 
     @Throws(Exception::class)
-    override fun getPlaylist(
+    override fun getPlaylist(id: String, name: String): MusicDirectory {
-        id: String,
-        name: String
-    ): MusicDirectory {
         val response = API.getPlaylist(id).execute().throwOnFailure()
 
         val playlist = response.body()!!.playlist.toMusicDirectoryDomainEntity(activeServerId)
@@ -248,21 +213,17 @@ open class RESTMusicService(
     }
 
     @Throws(IOException::class)
-    private fun savePlaylist(
+    private fun savePlaylist(name: String, playlist: MusicDirectory) {
-        name: String,
-        playlist: MusicDirectory
-    ) {
         val playlistFile = FileUtil.getPlaylistFile(
-            activeServerProvider.getActiveServer().name, name
+            activeServerProvider.getActiveServer().name,
+            name
         )
 
         FileUtil.savePlaylist(playlistFile, playlist, name)
     }
 
     @Throws(Exception::class)
-    override fun getPlaylists(
+    override fun getPlaylists(refresh: Boolean): List<Playlist> {
-        refresh: Boolean
-    ): List<Playlist> {
         val response = API.getPlaylists(null).execute().throwOnFailure()
 
         return response.body()!!.playlists.toDomainEntitiesList()
@@ -274,11 +235,7 @@ open class RESTMusicService(
      * String is required when creating
      */
     @Throws(Exception::class)
-    override fun createPlaylist(
+    override fun createPlaylist(id: String?, name: String?, tracks: List<Track>) {
-        id: String?,
-        name: String?,
-        tracks: List<Track>
-    ) {
         require(id != null || name != null) { "Either id or name is required." }
         val pSongIds: MutableList<String> = ArrayList(tracks.size)
 
@@ -290,36 +247,25 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun deletePlaylist(
+    override fun deletePlaylist(id: String) {
-        id: String
-    ) {
         API.deletePlaylist(id).execute().throwOnFailure()
     }
 
     @Throws(Exception::class)
-    override fun updatePlaylist(
+    override fun updatePlaylist(id: String, name: String?, comment: String?, pub: Boolean) {
-        id: String,
-        name: String?,
-        comment: String?,
-        pub: Boolean
-    ) {
         API.updatePlaylist(id, name, comment, pub, null, null)
             .execute().throwOnFailure()
     }
 
     @Throws(Exception::class)
-    override fun getPodcastsChannels(
+    override fun getPodcastsChannels(refresh: Boolean): List<PodcastsChannel> {
-        refresh: Boolean
-    ): List<PodcastsChannel> {
         val response = API.getPodcasts(false, null).execute().throwOnFailure()
 
         return response.body()!!.podcastChannels.toDomainEntitiesList()
     }
 
     @Throws(Exception::class)
-    override fun getPodcastEpisodes(
+    override fun getPodcastEpisodes(podcastChannelId: String?): MusicDirectory {
-        podcastChannelId: String?
-    ): MusicDirectory {
         val response = API.getPodcasts(true, podcastChannelId).execute().throwOnFailure()
 
         val podcastEntries = response.body()!!.podcastChannels[0].episodeList
@@ -340,20 +286,14 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun getLyrics(
+    override fun getLyrics(artist: String, title: String): Lyrics {
-        artist: String,
-        title: String
-    ): Lyrics {
         val response = API.getLyrics(artist, title).execute().throwOnFailure()
 
         return response.body()!!.lyrics.toDomainEntity()
     }
 
     @Throws(Exception::class)
-    override fun scrobble(
+    override fun scrobble(id: String, submission: Boolean) {
-        id: String,
-        submission: Boolean
-    ) {
         API.scrobble(id, null, submission).execute().throwOnFailure()
     }
 
@@ -398,9 +338,7 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun getRandomSongs(
+    override fun getRandomSongs(size: Int): MusicDirectory {
-        size: Int
-    ): MusicDirectory {
         val response = API.getRandomSongs(
             size,
             null,
@@ -464,11 +402,7 @@ open class RESTMusicService(
      * call because that could take a long time.
      */
     @Throws(Exception::class)
-    override fun getStreamUrl(
+    override fun getStreamUrl(id: String, maxBitRate: Int?, format: String?): String {
-        id: String,
-        maxBitRate: Int?,
-        format: String?
-    ): String {
         Timber.i("Start")
 
         // Get the request from Retrofit, but don't execute it!
@@ -510,9 +444,7 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun updateJukeboxPlaylist(
+    override fun updateJukeboxPlaylist(ids: List<String>): JukeboxStatus {
-        ids: List<String>
-    ): JukeboxStatus {
         val response = API.jukeboxControl(JukeboxAction.SET, null, null, ids, null)
             .execute().throwOnFailure()
 
@@ -520,10 +452,7 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun skipJukebox(
+    override fun skipJukebox(index: Int, offsetSeconds: Int): JukeboxStatus {
-        index: Int,
-        offsetSeconds: Int
-    ): JukeboxStatus {
         val response = API.jukeboxControl(JukeboxAction.SKIP, index, offsetSeconds, null, null)
             .execute().throwOnFailure()
 
@@ -563,9 +492,7 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun setJukeboxGain(
+    override fun setJukeboxGain(gain: Float): JukeboxStatus {
-        gain: Float
-    ): JukeboxStatus {
         val response = API.jukeboxControl(JukeboxAction.SET_GAIN, null, null, null, gain)
             .execute().throwOnFailure()
 
@@ -573,29 +500,21 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun getShares(
+    override fun getShares(refresh: Boolean): List<Share> {
-        refresh: Boolean
-    ): List<Share> {
         val response = API.getShares().execute().throwOnFailure()
 
         return response.body()!!.shares.toDomainEntitiesList(activeServerId)
     }
 
     @Throws(Exception::class)
-    override fun getGenres(
+    override fun getGenres(refresh: Boolean): List<Genre> {
-        refresh: Boolean
-    ): List<Genre> {
         val response = API.getGenres().execute().throwOnFailure()
 
         return response.body()!!.genresList.toDomainEntityList()
     }
 
     @Throws(Exception::class)
-    override fun getSongsByGenre(
+    override fun getSongsByGenre(genre: String, count: Int, offset: Int): MusicDirectory {
-        genre: String,
-        count: Int,
-        offset: Int
-    ): MusicDirectory {
         val response = API.getSongsByGenre(genre, count, offset, null).execute().throwOnFailure()
 
         val result = MusicDirectory()
@@ -605,27 +524,21 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun getUser(
+    override fun getUser(username: String): UserInfo {
-        username: String
-    ): UserInfo {
         val response = API.getUser(username).execute().throwOnFailure()
 
         return response.body()!!.user.toDomainEntity()
     }
 
     @Throws(Exception::class)
-    override fun getChatMessages(
+    override fun getChatMessages(since: Long?): List<ChatMessage> {
-        since: Long?
-    ): List<ChatMessage> {
         val response = API.getChatMessages(since).execute().throwOnFailure()
 
         return response.body()!!.chatMessages.toDomainEntitiesList()
     }
 
     @Throws(Exception::class)
-    override fun addChatMessage(
+    override fun addChatMessage(message: String) {
-        message: String
-    ) {
         API.addChatMessage(message).execute().throwOnFailure()
     }
 
@@ -637,24 +550,17 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun createBookmark(
+    override fun createBookmark(id: String, position: Int) {
-        id: String,
-        position: Int
-    ) {
         API.createBookmark(id, position.toLong(), null).execute().throwOnFailure()
     }
 
     @Throws(Exception::class)
-    override fun deleteBookmark(
+    override fun deleteBookmark(id: String) {
-        id: String
-    ) {
         API.deleteBookmark(id).execute().throwOnFailure()
     }
 
     @Throws(Exception::class)
-    override fun getVideos(
+    override fun getVideos(refresh: Boolean): MusicDirectory {
-        refresh: Boolean
-    ): MusicDirectory {
         val response = API.getVideos().execute().throwOnFailure()
 
         val musicDirectory = MusicDirectory()
@@ -664,29 +570,19 @@ open class RESTMusicService(
     }
 
     @Throws(Exception::class)
-    override fun createShare(
+    override fun createShare(ids: List<String>, description: String?, expires: Long?): List<Share> {
-        ids: List<String>,
-        description: String?,
-        expires: Long?
-    ): List<Share> {
         val response = API.createShare(ids, description, expires).execute().throwOnFailure()
 
         return response.body()!!.shares.toDomainEntitiesList(activeServerId)
     }
 
     @Throws(Exception::class)
-    override fun deleteShare(
+    override fun deleteShare(id: String) {
-        id: String
-    ) {
         API.deleteShare(id).execute().throwOnFailure()
     }
 
     @Throws(Exception::class)
-    override fun updateShare(
+    override fun updateShare(id: String, description: String?, expires: Long?) {
-        id: String,
-        description: String?,
-        expires: Long?
-    ) {
         var expiresValue: Long? = expires
         if (expires != null && expires == 0L) {
             expiresValue = null

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RatingManager.kt

@@ -49,8 +49,11 @@ class RatingManager : CoroutineScope by CoroutineScope(Dispatchers.Default) {
                 var success = false
                 withContext(Dispatchers.IO) {
                     try {
-                        if (update.rating.isHeart) service.star(id)
+                        if (update.rating.isHeart) {
-                        else service.unstar(id)
+                            service.star(id)
+                        } else {
+                            service.unstar(id)
+                        }
                         success = true
                     } catch (all: Exception) {
                         Timber.e(all)

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RxBus.kt

@@ -29,6 +29,7 @@ class RxBus {
 
         var activeServerChangingPublisher: PublishSubject<Int> =
             PublishSubject.create()
+
         // Subscribers should be called synchronously, not on another thread
         var activeServerChangingObservable: Observable<Int> =
             activeServerChangingPublisher

ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/ImageLoaderProvider.kt

@@ -68,7 +68,9 @@ class ImageLoaderProvider :
         val config by lazy {
             var defaultSize = 0
             val fallbackImage = ResourcesCompat.getDrawable(
-                UApp.applicationContext().resources, R.drawable.unknown_album, null
+                UApp.applicationContext().resources,
+                R.drawable.unknown_album,
+                null
             )
 
             // Determine the density-dependent image sizes by taking the fallback album