Merge branch 'feature/cache-fix' into 'develop'

Fixed cache space cleanup

Closes #1284

See merge request ultrasonic/ultrasonic!1206

.editorconfig

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

.gitignore

@@ -18,6 +18,7 @@ out/
 
 # Gradle files
 .gradle/
+.kotlin/
 build/
 
 # Local configuration file (sdk path, etc)

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 default:
-  image: registry.gitlab.com/ultrasonic/ci-android:1.1.0
+  image: registry.gitlab.com/ultrasonic/ci-android:1.2.0
   cache: &global_cache
     key:
       files:
@@ -138,7 +138,7 @@ RoboTest:
   script:
     - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
     - gcloud auth activate-service-account --key-file .secure_files/firebase-key.json 
-    - gcloud firebase test android run --project ultrasonic-61089 --type robo --app ultrasonic-release/${PACKAGE_APK} --robo-directives click:button1= --device model=Nexus6,version=21,locale=en,orientation=portrait  --device model=Pixel3,version=28,locale=fr,orientation=landscape --device model=Pixel5,version=30,locale=zh,orientation=portrait 
+    - gcloud firebase test android run --project ultrasonic-61089 --type robo --app ultrasonic-release/${PACKAGE_APK} --robo-directives click:button1= --device model=Nexus6,version=21,locale=en,orientation=portrait  --device model=Pixel3,version=28,locale=fr,orientation=landscape 
   rules:
     # Run when releasing a new tag
     - if: $CI_COMMIT_TAG && $CI_PROJECT_ID == $ROOT_PROJECT_ID

.idea/codeStyles/Project.xml

@@ -1,11 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value />
-      </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>

build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     apply from: 'gradle/versions.gradle'
@@ -10,7 +12,8 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
+        maven { url = "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath libs.gradle
@@ -26,24 +29,32 @@ allprojects {
     buildscript {
         repositories {
             mavenCentral()
+            gradlePluginPortal()
             google()
         }
     }
 
     repositories {
         mavenCentral()
+        gradlePluginPortal()
         google()
     }
 
     // Set Kotlin JVM target to the same for all subprojects
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    tasks.withType(KotlinCompile).configureEach {
         kotlinOptions {
-            jvmTarget = "17"
+            jvmTarget = "21"
+        }
+    }
+
+    tasks.withType(JavaCompile).tap {
+        configureEach {
+            options.compilerArgs.add("-Xlint:deprecation")
         }
     }
 }
 
 wrapper {
-    gradleVersion(libs.versions.gradle.get())
+    gradleVersion = libs.versions.gradle.get()
-    distributionType("all")
+    distributionType = "all"
 }

core/domain/build.gradle

@@ -1,13 +1,20 @@
+plugins {
+    alias libs.plugins.ksp
+}
+
 apply from: bootstrap.androidModule
-apply plugin: 'kotlin-kapt'
 
 dependencies {
     implementation libs.core
     implementation libs.roomRuntime
     implementation libs.roomKtx
-    kapt libs.room
+    ksp libs.room
 }
 
 android {
-    namespace 'org.moire.ultrasonic.subsonic.domain'
+    namespace = 'org.moire.ultrasonic.subsonic.domain'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
 }

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/build.gradle

@@ -1,5 +1,14 @@
+plugins {
+    alias libs.plugins.ksp
+}
+
 apply from: bootstrap.kotlinModule
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
 dependencies {
     api libs.retrofit
     api libs.jacksonConverter

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)

fastlane/metadata/android/en-US/changelogs/125.txt

@@ -0,0 +1,15 @@
+Features:
+- Search is accessible through a new icon on the main screen
+- Modernize Back Handling
+- Reenable R8 Code minification
+- Add a "Play Random Songs" shortcut
+
+Bug fixes:
+- Avoid triggering a bug in Supysonic
+- Readd the "Star" button to the Now Playing screen
+- Fix a rare crash when shuffling playlists with duplicate entries
+- Fix a crash when choosing "Play next" on an empty playlist.
+- Tracks buttons flash a scrollbar sometimes in Android 13
+- Fix EndlessScrolling in genre listing
+- Couldn't delete a track when shuffle was active
+

fastlane/metadata/android/en-US/changelogs/126.txt

@@ -0,0 +1,15 @@
+Features:
+- Search is accessible through a new icon on the main screen
+- Modernize Back Handling
+- Reenable R8 Code minification
+- Add a "Play Random Songs" shortcut
+
+Bug fixes:
+- Fix a few crashes
+- Avoid triggering a bug in Supysonic
+- Readd the "Star" button to the Now Playing screen
+- Fix a rare crash when shuffling playlists with duplicate entries
+- Fix a crash when choosing "Play next" on an empty playlist.
+- Tracks buttons flash a scrollbar sometimes in Android 13
+- Fix EndlessScrolling in genre listing
+- Couldn't delete a track when shuffle was active

fastlane/metadata/android/en-US/changelogs/128.txt

@@ -0,0 +1,9 @@
+### Features
+- Added custom buttons for shuffling the current queue and setting repeat mode (Android Auto)
+- Properly handling nested directory structures (Android Auto)
+- Add a toast when adding tracks to the playlist
+- Allow pinning when offline
+
+### Dependencies
+- Update koin
+- Update media3 to v1.1.0

fastlane/metadata/android/en-US/changelogs/129.txt

@@ -0,0 +1,12 @@
+### Fixes
+- Fix a bug in 4.7.0 that repeat mode was activated by default.
+
+### Features
+- Added custom buttons for shuffling the current queue and setting repeat mode (Android Auto)
+- Properly handling nested directory structures (Android Auto)
+- Add a toast when adding tracks to the playlist
+- Allow pinning when offline
+
+### Dependencies
+- Update koin
+- Update media3 to v1.1.0

fastlane/metadata/android/en-US/changelogs/130.txt

@@ -0,0 +1,5 @@
+### Features
+- Improved display of rating stars
+- Completely modernize all older code parts
+- Updates for Android 14
+- Update dependencies

gradle/libs.versions.toml

@@ -1,44 +1,46 @@
 [versions]
 # You need to run ./gradlew wrapper after updating the version
-gradle                 = "8.1.1"
+gradle                 = "8.13"
 
-navigation             = "2.6.0"
+navigation             = "2.8.9"
-gradlePlugin           = "8.0.2"
+gradlePlugin           = "8.9.1"
-androidxcore           = "1.10.1"
+androidxcar            = "1.4.0"
-ktlint                 = "0.43.2"
+androidxcore           = "1.16.0"
-ktlintGradle           = "11.4.2"
+ktlint                 = "1.0.1"
-detekt                 = "1.23.0"
+ktlintGradle           = "12.2.0"
-preferences            = "1.2.0"
+detekt                 = "1.23.8"
-media3                 = "1.0.2"
+preferences            = "1.2.1"
+media3                 = "1.6.1"
 
-androidSupport         = "1.6.0"
+androidSupport         = "1.9.1"
-materialDesign         = "1.9.0"
+materialDesign         = "1.12.0"
-constraintLayout       = "2.1.4"
+constraintLayout       = "2.2.1"
+activity               = "1.10.1"
 multidex               = "2.0.1"
-room                   = "2.5.2"
+room                   = "2.7.0"
-kotlin                 = "1.8.22"
+kotlin                 = "2.1.20"
-kotlinxCoroutines      = "1.7.1"
+ksp                    = "2.1.20-2.0.0"
-viewModelKtx           = "2.6.1"
+kotlinxCoroutines      = "1.10.2"
+viewModelKtx           = "2.8.7"
 swipeRefresh           = "1.1.0"
 
-retrofit               = "2.9.0"
+retrofit               = "2.11.0"
-## KEEP ON 2.13 branch (https://github.com/FasterXML/jackson-databind/issues/3658#issuecomment-1312633064) for compatibility with API 24
+jackson                = "2.18.3"
-jackson                = "2.13.5"
+okhttp                 = "4.12.0"
-okhttp                 = "4.11.0"
+koin                   = "4.0.4"
-koin                   = "3.3.2"
 picasso                = "2.8"
 
 junit4                 = "4.13.2"
-junit5                 = "5.9.3"
+junit5                 = "5.12.2"
-mockito                = "5.4.0"
+mockito                = "5.17.0"
-mockitoKotlin          = "5.0.0"
+mockitoKotlin          = "5.4.0"
 kluent                 = "1.73"
-apacheCodecs           = "1.16.0"
+apacheCodecs           = "1.18.0"
-robolectric            = "4.10.3"
+robolectric            = "4.14.1"
 timber                 = "5.0.1"
 fastScroll             = "2.0.1"
-colorPicker            = "2.2.4"
+colorPicker            = "2.3.0"
-rxJava                 = "3.1.6"
+rxJava                 = "3.1.10"
 rxAndroid              = "3.0.2"
 multiType              = "4.3.0"
 
@@ -48,6 +50,7 @@ kotlin                  = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin"
 ktlintGradle            = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlintGradle" }
 detekt                  = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 
+car                     = { module = "androidx.car.app:app", version.ref = "androidxcar" }
 core                    = { module = "androidx.core:core-ktx", version.ref = "androidxcore" }
 design                  = { module = "com.google.android.material:material", version.ref = "materialDesign" }
 annotations             = { module = "androidx.annotation:annotation", version.ref = "androidSupport" }
@@ -63,6 +66,7 @@ navigationFragmentKtx   = { module = "androidx.navigation:navigation-fragment-kt
 navigationUiKtx         = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" }
 navigationFeature       = { module = "androidx.navigation:navigation-dynamic-features-fragment", version.ref = "navigation" }
 navigationSafeArgs      = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "navigation"}
+activity                = { module = "androidx.activity:activity-ktx", version.ref = "activity" }
 preferences             = { module = "androidx.preference:preference", version.ref = "preferences" }
 media3common            = { module = "androidx.media3:media3-common", version.ref = "media3" }
 media3exoplayer         = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
@@ -100,3 +104,6 @@ kluentAndroid           = { module = "org.amshove.kluent:kluent-android", versio
 mockWebServer           = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
 apacheCodecs            = { module = "commons-codec:commons-codec", version.ref = "apacheCodecs" }
 robolectric             = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+
+[plugins]
+ksp                     = { id = "com.google.devtools.ksp", version.ref = "ksp" }

gradle/versions.gradle

@@ -1,5 +1,5 @@
 ext.versions = [
-        minSdk               : 21,
+        minSdk               : 26,
         targetSdk            : 33,
-        compileSdk           : 33,
+        compileSdk           : 35,
-]
+]

gradle/wrapper/gradle-wrapper.properties

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

gradle_scripts/android-module-bootstrap.gradle

@@ -4,7 +4,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
 apply from: "${project.rootDir}/gradle_scripts/code_quality.gradle"
-apply plugin: 'org.jetbrains.kotlin.kapt'
+apply plugin: 'com.google.devtools.ksp'
 
 android {
     compileSdkVersion versions.compileSdk

gradle_scripts/kotlin-module-bootstrap.gradle

@@ -2,7 +2,7 @@
  * This module provides a base for for pure kotlin modules
  */
 apply plugin: 'kotlin'
-apply plugin: 'org.jetbrains.kotlin.kapt'
+apply plugin: 'com.google.devtools.ksp'
 apply from: "${project.rootDir}/gradle_scripts/code_quality.gradle"
 
 sourceSets {
@@ -12,7 +12,6 @@ sourceSets {
     test.resources.srcDirs += "${projectDir}/src/integrationTest/resources"
 }
 
-
 dependencies {
     api libs.kotlinStdlib
 

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +133,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +147,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +155,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +204,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
+# Collect all arguments for the java command:
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     shell script including quotes and variable substitutions, so put them in
+#     and any embedded shellness will be escaped.
-#     double quotes to make sure that they get re-expanded; and
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#   * put everything else in single quotes, so that it's not re-expanded.
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 

ultrasonic/build.gradle

@@ -1,6 +1,9 @@
+plugins {
+    alias libs.plugins.ksp
+}
+
 apply plugin: 'com.android.application'
 apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: 'org.jetbrains.kotlin.kapt'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 apply from: "../gradle_scripts/code_quality.gradle"
 
@@ -9,8 +12,8 @@ android {
 
     defaultConfig {
         applicationId "org.moire.ultrasonic"
-        versionCode 124
+        versionCode 130
-        versionName "4.6.1"
+        versionName "4.8.0"
 
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
@@ -31,10 +34,10 @@ android {
                     'minify/proguard-kotlin.pro'
         }
         debug {
-            minifyEnabled false
+            minifyEnabled = false
-            multiDexEnabled true
+            multiDexEnabled = true
-            testCoverageEnabled true
+            testCoverageEnabled = true
-            applicationIdSuffix '.debug'
+            applicationIdSuffix = '.debug'
         }
     }
 
@@ -50,42 +53,43 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 
     buildFeatures {
-        viewBinding true
+        viewBinding = true
-        dataBinding true
+        dataBinding = true
-        buildConfig true
+        buildConfig = true
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_21
     }
 
-    kapt {
+    ksp {
-        arguments {
+        arg("room.schemaLocation", "$rootDir/ultrasonic/schemas")
-            arg("room.schemaLocation", "$rootDir/ultrasonic/schemas".toString())
-        }
     }
 
     lint {
         baseline = file("lint-baseline.xml")
-        abortOnError true
+        abortOnError = true
-        warningsAsErrors true
+        warningsAsErrors = true
-        disable 'IconMissingDensityFolder', 'VectorPath'
-        ignore 'MissingTranslation', 'UnusedQuantity', 'MissingQuantity'
         warning 'ImpliedQuantity'
+        disable 'IconMissingDensityFolder', 'VectorPath'
+        disable 'MissingTranslation', 'UnusedQuantity', 'MissingQuantity'
         disable 'ObsoleteLintCustomCheck'
-        textReport true
+        // We manage dependencies on Gitlab with RenovateBot
-        checkDependencies true
+        disable 'GradleDependency'
+        disable 'AndroidGradlePluginVersion'
+        textReport = true
+        checkDependencies = true
     }
-    namespace 'org.moire.ultrasonic'
+    namespace = 'org.moire.ultrasonic'
 
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     useJUnitPlatform()
 }
 
@@ -97,6 +101,7 @@ dependencies {
         exclude group: "com.android.support"
     }
 
+    implementation libs.car
     implementation libs.core
     implementation libs.design
     implementation libs.multidex
@@ -129,7 +134,7 @@ dependencies {
     implementation libs.rxAndroid
     implementation libs.multiType
 
-    kapt libs.room
+    ksp libs.room
 
     testImplementation libs.kotlinReflect
     testImplementation libs.junit
@@ -141,6 +146,5 @@ dependencies {
     testImplementation libs.robolectric
 
     implementation libs.timber
-
 }
 

ultrasonic/detekt-baseline.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" ?>
 <SmellBaseline>
-  <ManuallySuppressedIssues>
+  <ManuallySuppressedIssues></ManuallySuppressedIssues>
-    <ID>TooManyFunctions:PlaybackService.kt$PlaybackService : MediaLibraryServiceKoinComponentCoroutineScope</ID>
+  <CurrentIssues>
-    <ID>UnusedPrivateMember:UApp.kt$private fun VmPolicy.Builder.detectAllExceptSocket(): VmPolicy.Builder</ID>
-    <ID>ImplicitDefaultLocale:EditServerFragment.kt$EditServerFragment.&lt;no name provided&gt;$String.format( "%s %s", resources.getString(R.string.settings_connection_failure), getErrorMessage(error) )</ID>
     <ID>ImplicitDefaultLocale:FileLoggerTree.kt$FileLoggerTree$String.format("Failed to write log to %s", file)</ID>
     <ID>ImplicitDefaultLocale:FileLoggerTree.kt$FileLoggerTree$String.format("Log file rotated, logging into file %s", file?.name)</ID>
     <ID>ImplicitDefaultLocale:FileLoggerTree.kt$FileLoggerTree$String.format("Logging into file %s", file?.name)</ID>
@@ -11,19 +9,11 @@
     <ID>LongMethod:EditServerFragment.kt$EditServerFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
     <ID>LongMethod:NavigationActivity.kt$NavigationActivity$override fun onCreate(savedInstanceState: Bundle?)</ID>
     <ID>LongMethod:PlaylistsFragment.kt$PlaylistsFragment$override fun onContextItemSelected(menuItem: MenuItem): Boolean</ID>
-    <ID>LongMethod:ShareHandler.kt$ShareHandler$private fun showDialog( fragment: Fragment, shareDetails: ShareDetails, swipe: SwipeRefreshLayout?, cancellationToken: CancellationToken, additionalId: String? )</ID>
     <ID>LongMethod:SharesFragment.kt$SharesFragment$override fun onContextItemSelected(menuItem: MenuItem): Boolean</ID>
-    <ID>LongParameterList:ServerRowAdapter.kt$ServerRowAdapter$( private var context: Context, passedData: Array&lt;ServerSetting&gt;, private val model: ServerSettingsModel, private val activeServerProvider: ActiveServerProvider, private val manageMode: Boolean, private val serverDeletedCallback: ((Int) -&gt; Unit), private val serverEditRequestedCallback: ((Int) -&gt; Unit) )</ID>
     <ID>MagicNumber:ActiveServerProvider.kt$ActiveServerProvider$8192</ID>
-    <ID>MagicNumber:JukeboxMediaPlayer.kt$JukeboxMediaPlayer$0.05f</ID>
     <ID>MagicNumber:JukeboxMediaPlayer.kt$JukeboxMediaPlayer$50</ID>
     <ID>MagicNumber:RESTMusicService.kt$RESTMusicService$206</ID>
-    <ID>NestedBlockDepth:DownloadHandler.kt$DownloadHandler$private fun downloadRecursively( fragment: Fragment, id: String, name: String?, isShare: Boolean, isDirectory: Boolean, save: Boolean, append: Boolean, autoPlay: Boolean, shuffle: Boolean, background: Boolean, playNext: Boolean, unpin: Boolean, isArtist: Boolean )</ID>
-    <ID>TooGenericExceptionCaught:FileLoggerTree.kt$FileLoggerTree$x: Throwable</ID>
-    <ID>TooGenericExceptionCaught:JukeboxMediaPlayer.kt$JukeboxMediaPlayer$x: Throwable</ID>
     <ID>TooGenericExceptionCaught:JukeboxMediaPlayer.kt$JukeboxMediaPlayer.TaskQueue$x: Throwable</ID>
     <ID>TooManyFunctions:RESTMusicService.kt$RESTMusicService : MusicService</ID>
-    <ID>UtilityClassWithPublicConstructor:FragmentTitle.kt$FragmentTitle</ID>
+  </CurrentIssues>
-  </ManuallySuppressedIssues>
-  <CurrentIssues/>
 </SmellBaseline>

ultrasonic/lint-baseline.xml

@@ -70,50 +70,6 @@
             column="1"/>
     </issue>
 
-    <issue
-        id="Autofill"
-        message="Missing `autofillHints` attribute"
-        errorLine1="        &lt;EditText"
-        errorLine2="         ~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat.xml"
-            line="33"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="Autofill"
-        message="Missing `autofillHints` attribute"
-        errorLine1="    &lt;EditText"
-        errorLine2="     ~~~~~~~~">
-        <location
-            file="src/main/res/layout/save_playlist.xml"
-            line="9"
-            column="6"/>
-    </issue>
-
-    <issue
-        id="Autofill"
-        message="Missing `autofillHints` attribute"
-        errorLine1="        &lt;EditText"
-        errorLine2="         ~~~~~~~~">
-        <location
-            file="src/main/res/layout/share_details.xml"
-            line="29"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="Autofill"
-        message="Missing `autofillHints` attribute"
-        errorLine1="        &lt;EditText"
-        errorLine2="         ~~~~~~~~">
-        <location
-            file="src/main/res/layout/time_span_dialog.xml"
-            line="28"
-            column="10"/>
-    </issue>
-
     <issue
         id="LabelFor"
         message="Missing accessibility label: provide either a view with an `android:labelFor` that references this view or provide an `android:hint`"

ultrasonic/src/main/AndroidManifest.xml

@@ -12,6 +12,8 @@
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
+    <uses-sdk tools:overrideLibrary="androidx.car.app" />
+
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
@@ -20,20 +22,22 @@
         android:xlargeScreens="true"/>
 
     <application
-        android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_descriptor"
-        android:hasFragileUserData="true" tools:targetApi="q"
-        android:dataExtractionRules="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/Theme.Material3.DynamicColors.Dark"
         android:name=".app.UApp"
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/backup_rules"
+        android:enableOnBackInvokedCallback="true"
+        android:fullBackupContent="@xml/backup_descriptor"
+        android:hasFragileUserData="true"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/common.appname"
-        android:usesCleartextTraffic="true"
-        android:supportsRtl="false"
-        android:preserveLegacyExternalStorage="true"
         android:networkSecurityConfig="@xml/network_security_config"
-        tools:ignore="UnusedAttribute">
+        android:preserveLegacyExternalStorage="true"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="false"
+        android:theme="@style/Theme.Material3.DynamicColors.Dark"
+        android:usesCleartextTraffic="true"
+        tools:ignore="UnusedAttribute"
+        tools:targetApi="q">
         <!-- Add for API 34 android:enableOnBackInvokedCallBack="true" -->
 
         <meta-data android:name="com.google.android.gms.car.application"
@@ -70,7 +74,7 @@
         </service>
 
         <!-- Needs to be exported: https://android.googlesource.com/platform/developers/build/+/4de32d4/prebuilts/gradle/MediaBrowserService/README.md -->
-        <service android:name=".playback.PlaybackService"
+        <service android:name=".service.PlaybackService"
             android:label="@string/common.appname"
             android:foregroundServiceType="mediaPlayback"
             android:exported="true"
@@ -105,6 +109,12 @@
                 <action android:name="android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED"/>
             </intent-filter>
         </receiver>
+        <receiver android:name="androidx.media3.session.MediaButtonReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
         <receiver
             android:name=".provider.UltrasonicAppWidgetProvider"
             android:label="Ultrasonic"
@@ -117,12 +127,6 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/appwidget_info"/>
         </receiver>
-        <receiver android:name=".receiver.MediaButtonIntentReceiver"
-            android:exported="true">
-            <intent-filter android:priority="2147483647">
-                <action android:name="android.intent.action.MEDIA_BUTTON"/>
-            </intent-filter>
-        </receiver>
         <provider
             android:name=".provider.SearchSuggestionProvider"
             android:authorities="${applicationId}.provider.SearchSuggestionProvider"
@@ -135,5 +139,4 @@
             android:exported="true"
             tools:ignore="ExportedContentProvider" />
     </application>
-
 </manifest>

ultrasonic/src/main/java/org/moire/ultrasonic/fragment/ChatFragment.java

@@ -1,297 +0,0 @@
-package org.moire.ultrasonic.fragment;
-
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.EditorInfo;
-import android.widget.EditText;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import org.moire.ultrasonic.R;
-import org.moire.ultrasonic.data.ActiveServerProvider;
-import org.moire.ultrasonic.domain.ChatMessage;
-import org.moire.ultrasonic.service.MusicService;
-import org.moire.ultrasonic.service.MusicServiceFactory;
-import org.moire.ultrasonic.util.BackgroundTask;
-import org.moire.ultrasonic.util.CancellationToken;
-import org.moire.ultrasonic.util.FragmentBackgroundTask;
-import org.moire.ultrasonic.util.Settings;
-import org.moire.ultrasonic.util.Util;
-import org.moire.ultrasonic.view.ChatAdapter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import kotlin.Lazy;
-
-import static org.koin.java.KoinJavaComponent.inject;
-
-import com.google.android.material.button.MaterialButton;
-
-/**
- * Provides online chat functionality
- */
-public class ChatFragment extends Fragment {
-
-    private ListView chatListView;
-    private EditText messageEditText;
-    private MaterialButton sendButton;
-    private Timer timer;
-    private volatile static Long lastChatMessageTime = (long) 0;
-    private static final ArrayList<ChatMessage> messageList = new ArrayList<>();
-    private CancellationToken cancellationToken;
-    private SwipeRefreshLayout swipeRefresh;
-
-    private final Lazy<ActiveServerProvider> activeServerProvider = inject(ActiveServerProvider.class);
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        Util.applyTheme(this.getContext());
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.chat, container, false);
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        swipeRefresh = view.findViewById(R.id.chat_refresh);
-        swipeRefresh.setEnabled(false);
-
-        cancellationToken = new CancellationToken();
-        messageEditText = view.findViewById(R.id.chat_edittext);
-        sendButton = view.findViewById(R.id.chat_send);
-
-        sendButton.setOnClickListener(view1 -> sendMessage());
-
-        chatListView = view.findViewById(R.id.chat_entries_list);
-        chatListView.setTranscriptMode(ListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
-        chatListView.setStackFromBottom(true);
-
-        String serverName = activeServerProvider.getValue().getActiveServer().getName();
-        String userName = activeServerProvider.getValue().getActiveServer().getUserName();
-        String title = String.format("%s [%s@%s]", getResources().getString(R.string.button_bar_chat), userName, serverName);
-
-        FragmentTitle.Companion.setTitle(this, title);
-        setHasOptionsMenu(true);
-
-        messageEditText.setImeActionLabel("Send", KeyEvent.KEYCODE_ENTER);
-
-        messageEditText.addTextChangedListener(new TextWatcher()
-        {
-            @Override
-            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2)
-            {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2)
-            {
-            }
-
-            @Override
-            public void afterTextChanged(Editable editable)
-            {
-                sendButton.setEnabled(!Util.isNullOrWhiteSpace(editable.toString()));
-            }
-        });
-
-        messageEditText.setOnEditorActionListener((v, actionId, event) -> {
-            if (actionId == EditorInfo.IME_ACTION_DONE || (actionId == EditorInfo.IME_NULL && event.getAction() == KeyEvent.ACTION_DOWN))
-            {
-                sendMessage();
-                return true;
-            }
-
-            return false;
-        });
-
-        load();
-        timerMethod();
-    }
-
-    @Override
-    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-        inflater.inflate(R.menu.chat, menu);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    /*
-     * Listen for option item selections so that we receive a notification
-     * when the user requests a refresh by selecting the refresh action bar item.
-     */
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Check if user triggered a refresh:
-        if (item.getItemId() == R.id.menu_refresh) {
-            // Start the refresh background task.
-            load();
-            return true;
-        }
-        // User didn't trigger a refresh, let the superclass handle this action
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onResume()
-    {
-        super.onResume();
-
-        if (!messageList.isEmpty())
-        {
-            ListAdapter chatAdapter = new ChatAdapter(getContext(), messageList);
-            chatListView.setAdapter(chatAdapter);
-        }
-
-        if (timer == null)
-        {
-            timerMethod();
-        }
-    }
-
-    @Override
-    public void onPause()
-    {
-        super.onPause();
-
-        if (timer != null)
-        {
-            timer.cancel();
-            timer = null;
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        cancellationToken.cancel();
-        super.onDestroyView();
-    }
-
-    private void timerMethod()
-    {
-        int refreshInterval = Settings.getChatRefreshInterval();
-
-        if (refreshInterval > 0)
-        {
-            timer = new Timer();
-
-            timer.schedule(new TimerTask()
-            {
-                @Override
-                public void run()
-                {
-                    getActivity().runOnUiThread(() -> load());
-                }
-            }, refreshInterval, refreshInterval);
-        }
-    }
-
-    private void sendMessage()
-    {
-        if (messageEditText != null)
-        {
-            final String message;
-            Editable text = messageEditText.getText();
-
-            if (text == null)
-            {
-                return;
-            }
-
-            message = text.toString();
-
-            if (!Util.isNullOrWhiteSpace(message))
-            {
-                messageEditText.setText("");
-
-                BackgroundTask<Void> task = new FragmentBackgroundTask<Void>(getActivity(), false, swipeRefresh, cancellationToken)
-                {
-                    @Override
-                    protected Void doInBackground() throws Throwable
-                    {
-                        MusicService musicService = MusicServiceFactory.getMusicService();
-                        musicService.addChatMessage(message);
-                        return null;
-                    }
-
-                    @Override
-                    protected void done(Void result)
-                    {
-                        load();
-                    }
-                };
-
-                task.execute();
-            }
-        }
-    }
-
-    private synchronized void load()
-    {
-        BackgroundTask<List<ChatMessage>> task = new FragmentBackgroundTask<List<ChatMessage>>(getActivity(), false, swipeRefresh, cancellationToken)
-        {
-            @Override
-            protected List<ChatMessage> doInBackground() throws Throwable
-            {
-                MusicService musicService = MusicServiceFactory.getMusicService();
-                return musicService.getChatMessages(lastChatMessageTime);
-            }
-
-            @Override
-            protected void done(List<ChatMessage> result)
-            {
-                if (result != null && !result.isEmpty())
-                {
-                    // Reset lastChatMessageTime if we have a newer message
-                    for (ChatMessage message : result)
-                    {
-                        if (message.getTime() > lastChatMessageTime)
-                        {
-                            lastChatMessageTime = message.getTime();
-                        }
-                    }
-
-                    // Reverse results to show them on the bottom
-                    Collections.reverse(result);
-                    messageList.addAll(result);
-
-                    ListAdapter chatAdapter = new ChatAdapter(getContext(), messageList);
-                    chatListView.setAdapter(chatAdapter);
-                }
-            }
-
-            @Override
-            protected void error(Throwable error) {
-                // Stop the timer in case of an error, otherwise it may repeat the error message forever
-                if (timer != null)
-                {
-                    timer.cancel();
-                    timer = null;
-                }
-                super.error(error);
-            }
-        };
-
-        task.execute();
-    }
-}

ultrasonic/src/main/java/org/moire/ultrasonic/receiver/UltrasonicIntentReceiver.java

@@ -1,38 +0,0 @@
-package org.moire.ultrasonic.receiver;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import timber.log.Timber;
-
-import org.moire.ultrasonic.service.MediaPlayerLifecycleSupport;
-
-import kotlin.Lazy;
-
-import static org.koin.java.KoinJavaComponent.inject;
-
-public class UltrasonicIntentReceiver extends BroadcastReceiver
-{
-	private Lazy<MediaPlayerLifecycleSupport> lifecycleSupport = inject(MediaPlayerLifecycleSupport.class);
-
-	@Override
-	public void onReceive(Context context, Intent intent)
-	{
-		String intentAction = intent.getAction();
-		Timber.i("Received Ultrasonic Intent: %s", intentAction);
-
-		try
-		{
-			lifecycleSupport.getValue().receiveIntent(intent);
-
-			if (isOrderedBroadcast())
-			{
-				abortBroadcast();
-			}
-		}
-		catch (Exception x)
-		{
-			// Ignored.
-		}
-	}
-}

ultrasonic/src/main/java/org/moire/ultrasonic/service/ExternalStorageMonitor.java

@@ -1,53 +0,0 @@
-package org.moire.ultrasonic.service;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-
-import org.moire.ultrasonic.app.UApp;
-
-import timber.log.Timber;
-
-/**
- * Monitors the state of the mobile's external storage
- */
-public class ExternalStorageMonitor
-{
-    private BroadcastReceiver ejectEventReceiver;
-    private boolean externalStorageAvailable = true;
-
-    public void onCreate(final Runnable ejectedCallback)
-    {
-        // Stop when SD card is ejected.
-        ejectEventReceiver = new BroadcastReceiver()
-        {
-            @Override
-            public void onReceive(Context context, Intent intent)
-            {
-                externalStorageAvailable = Intent.ACTION_MEDIA_MOUNTED.equals(intent.getAction());
-                if (!externalStorageAvailable)
-                {
-                    Timber.i("External media is ejecting. Stopping playback.");
-                    ejectedCallback.run();
-                }
-                else
-                {
-                    Timber.i("External media is available.");
-                }
-            }
-        };
-
-        IntentFilter ejectFilter = new IntentFilter(Intent.ACTION_MEDIA_EJECT);
-        ejectFilter.addAction(Intent.ACTION_MEDIA_MOUNTED);
-        ejectFilter.addDataScheme("file");
-        UApp.Companion.applicationContext().registerReceiver(ejectEventReceiver, ejectFilter);
-    }
-
-    public void onDestroy()
-    {
-        UApp.Companion.applicationContext().unregisterReceiver(ejectEventReceiver);
-    }
-
-    public boolean isExternalStorageAvailable() { return externalStorageAvailable; }
-}

ultrasonic/src/main/java/org/moire/ultrasonic/service/Scrobbler.java

@@ -1,50 +0,0 @@
-package org.moire.ultrasonic.service;
-
-import timber.log.Timber;
-import org.moire.ultrasonic.data.ActiveServerProvider;
-import org.moire.ultrasonic.domain.Track;
-
-/**
- * Scrobbles played songs to Last.fm.
- *
- * @author Sindre Mehus
- * @version $Id$
- */
-public class Scrobbler
-{
-	private String lastSubmission;
-	private String lastNowPlaying;
-
-	public void scrobble(final Track song, final boolean submission)
-	{
-		if (song == null || !ActiveServerProvider.Companion.isScrobblingEnabled()) return;
-
-		final String id = song.getId();
-
-		// Avoid duplicate registrations.
-		if (submission && id.equals(lastSubmission)) return;
-
-		if (!submission && id.equals(lastNowPlaying)) return;
-
-		if (submission)	lastSubmission = id;
-		else lastNowPlaying = id;
-
-		new Thread(String.format("Scrobble %s", song))
-		{
-			@Override
-			public void run()
-			{
-				MusicService service = MusicServiceFactory.getMusicService();
-				try
-				{
-					service.scrobble(id, submission);
-					Timber.i("Scrobbled '%s' for %s", submission ? "submission" : "now playing", song);
-				}
-				catch (Exception x)
-				{
-					Timber.i(x, "Failed to scrobble'%s' for %s", submission ? "submission" : "now playing", song);
-				}
-			}
-		}.start();
-	}
-}

ultrasonic/src/main/java/org/moire/ultrasonic/service/Supplier.java

@@ -1,12 +0,0 @@
-package org.moire.ultrasonic.service;
-
-/**
- * Abstract class for supplying items to a consumer
- * @param <T> The type of the item supplied
- */
-public abstract class Supplier<T>
-{
-    public abstract T get();
-}
-
-

ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java

@@ -1,72 +0,0 @@
-/*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2009 (C) Sindre Mehus
- */
-package org.moire.ultrasonic.util;
-
-import android.app.Activity;
-import android.os.Handler;
-
-/**
- * @author Sindre Mehus
- */
-public abstract class BackgroundTask<T> implements ProgressListener
-{
-	private final Activity activity;
-	private final Handler handler;
-
-	public BackgroundTask(Activity activity)
-	{
-		this.activity = activity;
-		handler = new Handler();
-	}
-
-	protected Activity getActivity()
-	{
-		return activity;
-	}
-
-	protected Handler getHandler()
-	{
-		return handler;
-	}
-
-	public abstract void execute();
-
-	protected abstract T doInBackground() throws Throwable;
-
-	protected abstract void done(T result);
-
-	protected void error(Throwable error)
-	{
-		CommunicationError.handleError(error, activity);
-	}
-
-	protected String getErrorMessage(Throwable error)
-	{
-		return CommunicationError.getErrorMessage(error);
-	}
-
-	@Override
-	public abstract void updateProgress(final String message);
-
-	@Override
-	public void updateProgress(int messageId)
-	{
-		updateProgress(activity.getResources().getString(messageId));
-	}
-}

ultrasonic/src/main/java/org/moire/ultrasonic/util/FragmentBackgroundTask.java

@@ -1,89 +0,0 @@
-package org.moire.ultrasonic.util;
-
-import android.app.Activity;
-
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-/**
- * @author Sindre Mehus
- * @version $Id$
- */
-public abstract class FragmentBackgroundTask<T> extends BackgroundTask<T>
-{
-	private final boolean changeProgress;
-	private final SwipeRefreshLayout swipe;
-	private final CancellationToken cancel;
-
-	public FragmentBackgroundTask(Activity activity, boolean changeProgress,
-								  SwipeRefreshLayout swipe, CancellationToken cancel)
-	{
-		super(activity);
-		this.changeProgress = changeProgress;
-		this.swipe = swipe;
-		this.cancel = cancel;
-	}
-
-	@Override
-	public void execute()
-	{
-		if (changeProgress)
-		{
-			if (swipe != null) swipe.setRefreshing(true);
-		}
-
-		new Thread()
-		{
-			@Override
-			public void run()
-			{
-				try
-				{
-					final T result = doInBackground();
-					if (cancel.isCancellationRequested())
-					{
-						return;
-					}
-
-					getHandler().post(new Runnable()
-					{
-						@Override
-						public void run()
-						{
-							if (changeProgress)
-							{
-								if (swipe != null) swipe.setRefreshing(false);
-							}
-
-							done(result);
-						}
-					});
-				}
-				catch (final Throwable t)
-				{
-					if (cancel.isCancellationRequested())
-					{
-						return;
-					}
-					getHandler().post(new Runnable()
-					{
-						@Override
-						public void run()
-						{
-							if (changeProgress)
-							{
-								if (swipe != null) swipe.setRefreshing(false);
-							}
-
-							error(t);
-						}
-					});
-				}
-			}
-		}.start();
-	}
-
-	@Override
-	public void updateProgress(final String message)
-	{
-	}
-}

ultrasonic/src/main/java/org/moire/ultrasonic/util/LoadingTask.java

@@ -1,66 +0,0 @@
-package org.moire.ultrasonic.util;
-
-import android.app.Activity;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-/**
- * @author Sindre Mehus
- * @version $Id$
- */
-public abstract class LoadingTask<T> extends BackgroundTask<T>
-{
-	private final SwipeRefreshLayout swipe;
-	private final CancellationToken cancel;
-
-	public LoadingTask(Activity activity, SwipeRefreshLayout swipe, CancellationToken cancel)
-	{
-		super(activity);
-		this.swipe = swipe;
-		this.cancel = cancel;
-	}
-
-
-	@Override
-	public void execute()
-	{
-		swipe.setRefreshing(true);
-
-		new Thread()
-		{
-			@Override
-			public void run()
-			{
-				try
-				{
-					final T result = doInBackground();
-					if (cancel.isCancellationRequested())
-					{
-						return;
-					}
-
-					getHandler().post(() -> {
-						swipe.setRefreshing(false);
-						done(result);
-					});
-				}
-				catch (final Throwable t)
-				{
-					if (cancel.isCancellationRequested())
-					{
-						return;
-					}
-
-					getHandler().post(() -> {
-						swipe.setRefreshing(false);
-						error(t);
-					});
-				}
-			}
-		}.start();
-	}
-
-	@Override
-	public void updateProgress(final String message)
-	{
-	}
-}

ultrasonic/src/main/java/org/moire/ultrasonic/util/ProgressListener.java

@@ -1,29 +0,0 @@
-/*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2009 (C) Sindre Mehus
- */
-package org.moire.ultrasonic.util;
-
-/**
- * @author Sindre Mehus
- */
-public interface ProgressListener
-{
-	void updateProgress(String message);
-
-	void updateProgress(int messageId);
-}

ultrasonic/src/main/java/org/moire/ultrasonic/util/ShareDetails.java

@@ -1,16 +0,0 @@
-package org.moire.ultrasonic.util;
-
-import org.moire.ultrasonic.domain.Track;
-
-import java.util.List;
-
-/**
- * Created by Josh on 12/17/13.
- */
-public class ShareDetails
-{
-	public String Description;
-	public boolean ShareOnServer;
-	public long Expiration;
-	public List<Track> Entries;
-}

ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreference.java

@@ -1,38 +0,0 @@
-package org.moire.ultrasonic.util;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import androidx.preference.DialogPreference;
-import org.moire.ultrasonic.R;
-
-/**
- * Created by Joshua Bahnsen on 12/22/13.
- */
-public class TimeSpanPreference extends DialogPreference
-{
-	Context context;
-
-	public TimeSpanPreference(Context context, AttributeSet attrs)
-	{
-		super(context, attrs);
-		this.context = context;
-
-		setPositiveButtonText(android.R.string.ok);
-		setNegativeButtonText(android.R.string.cancel);
-
-		setDialogIcon(null);
-
-	}
-
-	public String getText()
-	{
-		String persisted = getPersistedString("");
-
-		if (!"".equals(persisted))
-		{
-			return persisted.replace(':', ' ');
-		}
-
-		return this.context.getResources().getString(R.string.time_span_disabled);
-	}
-}

ultrasonic/src/main/java/org/moire/ultrasonic/view/ChatAdapter.java

@@ -1,159 +0,0 @@
-package org.moire.ultrasonic.view;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.text.util.Linkify;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-import org.moire.ultrasonic.R;
-import org.moire.ultrasonic.data.ActiveServerProvider;
-import org.moire.ultrasonic.domain.ChatMessage;
-import org.moire.ultrasonic.imageloader.ImageLoader;
-import org.moire.ultrasonic.subsonic.ImageLoaderProvider;
-
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import kotlin.Lazy;
-
-import static org.koin.java.KoinJavaComponent.inject;
-
-public class ChatAdapter extends ArrayAdapter<ChatMessage>
-{
-	private final Context context;
-	private final List<ChatMessage> messages;
-
-	private static final String phoneRegex = "1?\\W*([2-9][0-8][0-9])\\W*([2-9][0-9]{2})\\W*([0-9]{4})";
-	private static final Pattern phoneMatcher = Pattern.compile(phoneRegex);
-
-	private final Lazy<ActiveServerProvider> activeServerProvider = inject(ActiveServerProvider.class);
-	private final Lazy<ImageLoaderProvider> imageLoaderProvider = inject(ImageLoaderProvider.class);
-
-	public ChatAdapter(Context context, List<ChatMessage> messages)
-	{
-		super(context, R.layout.chat_item, messages);
-		this.context = context;
-		this.messages = messages;
-	}
-
-	@Override
-	public boolean areAllItemsEnabled() {
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled(int position) {
-		return false;
-	}
-
-	@Override
-	public int getCount()
-	{
-		return messages.size();
-	}
-
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent)
-	{
-		ChatMessage message = this.getItem(position);
-
-		ViewHolder holder;
-		int layout;
-
-		String messageUser = message.getUsername();
-		Date messageTime = new java.util.Date(message.getTime());
-		String messageText = message.getMessage();
-
-		String me = activeServerProvider.getValue().getActiveServer().getUserName();
-
-		layout = messageUser.equals(me) ? R.layout.chat_item_reverse : R.layout.chat_item;
-
-		if (convertView == null)
-		{
-			convertView = inflateView(layout, parent);
-			holder = createViewHolder(layout, convertView);
-		}
-		else
-		{
-			holder = (ViewHolder) convertView.getTag();
-
-			if (!holder.chatMessage.equals(message))
-			{
-				convertView = inflateView(layout, parent);
-				holder = createViewHolder(layout, convertView);
-			}
-		}
-
-		holder.chatMessage = message;
-
-		DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(context);
-		String messageTimeFormatted = String.format("[%s]", timeFormat.format(messageTime));
-
-		ImageLoader imageLoader = imageLoaderProvider.getValue().getImageLoader();
-
-		if (holder.avatar != null && !TextUtils.isEmpty(messageUser))
-		{
-			imageLoader.loadAvatarImage(holder.avatar, messageUser);
-		}
-
-		holder.username.setText(messageUser);
-		holder.message.setText(messageText);
-		holder.time.setText(messageTimeFormatted);
-
-		return convertView;
-	}
-
-	private View inflateView(int layout, ViewGroup parent)
-	{
-		return LayoutInflater.from(context).inflate(layout, parent, false);
-	}
-
-	private static ViewHolder createViewHolder(int layout, View convertView)
-	{
-		ViewHolder holder = new ViewHolder();
-		holder.layout = layout;
-
-		TextView usernameView;
-		TextView timeView;
-		TextView messageView;
-		ImageView imageView;
-
-		if (convertView != null)
-		{
-			usernameView = (TextView) convertView.findViewById(R.id.chat_username);
-			timeView = (TextView) convertView.findViewById(R.id.chat_time);
-			messageView = (TextView) convertView.findViewById(R.id.chat_message);
-			imageView = (ImageView) convertView.findViewById(R.id.chat_avatar);
-
-			messageView.setMovementMethod(LinkMovementMethod.getInstance());
-			Linkify.addLinks(messageView, Linkify.ALL);
-			Linkify.addLinks(messageView, phoneMatcher, "tel:");
-
-			holder.avatar = imageView;
-			holder.message = messageView;
-			holder.username = usernameView;
-			holder.time = timeView;
-
-			convertView.setTag(holder);
-		}
-
-		return holder;
-	}
-
-	private static class ViewHolder
-	{
-		int layout;
-		ImageView avatar;
-		TextView message;
-		TextView username;
-		TextView time;
-		ChatMessage chatMessage;
-	}
-}

ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java

@@ -1,110 +0,0 @@
-/*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2010 (C) Sindre Mehus
- */
-package org.moire.ultrasonic.view;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.SectionIndexer;
-import android.widget.TextView;
-
-import org.moire.ultrasonic.R;
-import org.moire.ultrasonic.domain.Genre;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-/**
- * @author Sindre Mehus
- */
-public class GenreAdapter extends ArrayAdapter<Genre> implements SectionIndexer
-{
-    private final LayoutInflater layoutInflater;
-	// Both arrays are indexed by section ID.
-	private final Object[] sections;
-	private final Integer[] positions;
-
-	public GenreAdapter(@NonNull Context context, List<Genre> genres)
-	{
-		super(context, R.layout.list_item_generic, genres);
-
-        layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-		Collection<String> sectionSet = new LinkedHashSet<String>(30);
-		List<Integer> positionList = new ArrayList<Integer>(30);
-
-		for (int i = 0; i < genres.size(); i++)
-		{
-			Genre genre = genres.get(i);
-			String index = genre.getIndex();
-			if (!sectionSet.contains(index))
-			{
-				sectionSet.add(index);
-				positionList.add(i);
-			}
-		}
-
-		sections = sectionSet.toArray(new Object[0]);
-		positions = positionList.toArray(new Integer[0]);
-	}
-
-    @NonNull
-    @Override
-    public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
-        View rowView = convertView;
-        if (rowView == null) {
-            rowView = layoutInflater.inflate(R.layout.list_item_generic, parent, false);
-        }
-
-        ((TextView) rowView).setText(getItem(position).getName());
-
-        return rowView;
-    }
-
-    @Override
-	public Object[] getSections()
-	{
-		return sections;
-	}
-
-	@Override
-	public int getPositionForSection(int section)
-	{
-		return positions[section];
-	}
-
-	@Override
-	public int getSectionForPosition(int pos)
-	{
-		for (int i = 0; i < sections.length - 1; i++)
-		{
-			if (pos < positions[i + 1])
-			{
-				return i;
-			}
-		}
-		return sections.length - 1;
-	}
-}

ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareAdapter.java

@@ -1,56 +0,0 @@
-package org.moire.ultrasonic.view;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.TextView;
-
-import org.moire.ultrasonic.R;
-import org.moire.ultrasonic.domain.Share;
-
-import java.util.List;
-
-/**
- * @author Sindre Mehus
- */
-public class ShareAdapter extends ArrayAdapter<Share>
-{
-	private final Context context;
-
-	public ShareAdapter(Context context, List<Share> Shares)
-	{
-		super(context, R.layout.share_list_item, Shares);
-		this.context = context;
-	}
-
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent)
-	{
-		Share entry = getItem(position);
-		ShareView view;
-
-		if (convertView instanceof ShareView)
-		{
-			ShareView currentView = (ShareView) convertView;
-
-			ViewHolder viewHolder = (ViewHolder) convertView.getTag();
-			view = currentView;
-			view.setViewHolder(viewHolder);
-		}
-		else
-		{
-			view = new ShareView(context);
-			view.setLayout();
-		}
-
-		view.setShare(entry);
-		return view;
-	}
-
-	static class ViewHolder
-	{
-		TextView url;
-		TextView description;
-	}
-}

ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareView.java

@@ -1,64 +0,0 @@
-/*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2009 (C) Sindre Mehus
- */
-package org.moire.ultrasonic.view;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.widget.LinearLayout;
-
-import org.moire.ultrasonic.R;
-import org.moire.ultrasonic.domain.Share;
-
-/**
- * Used to display playlists in a {@code ListView}.
- *
- * @author Joshua Bahnsen
- */
-public class ShareView extends LinearLayout
-{
-	private final Context context;
-	private ShareAdapter.ViewHolder viewHolder;
-
-	public ShareView(Context context)
-	{
-		super(context);
-		this.context = context;
-	}
-
-	public void setLayout()
-	{
-		LayoutInflater.from(context).inflate(R.layout.share_list_item, this, true);
-		viewHolder = new ShareAdapter.ViewHolder();
-		viewHolder.url = findViewById(R.id.share_url);
-		viewHolder.description = findViewById(R.id.share_description);
-		setTag(viewHolder);
-	}
-
-	public void setViewHolder(ShareAdapter.ViewHolder viewHolder)
-	{
-		this.viewHolder = viewHolder;
-		setTag(this.viewHolder);
-	}
-
-	public void setShare(Share share)
-	{
-		viewHolder.url.setText(share.getName());
-		viewHolder.description.setText(share.getDescription());
-	}
-}

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

@@ -1,6 +1,6 @@
 /*
  * NavigationActivity.kt
- * Copyright (C) 2009-2022 Ultrasonic developers
+ * Copyright (C) 2009-2023 Ultrasonic developers
  *
  * Distributed under terms of the GNU GPLv3 license.
  */
@@ -13,7 +13,6 @@ import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Resources
 import android.media.AudioManager
-import android.os.Build
 import android.os.Bundle
 import android.provider.MediaStore
 import android.provider.SearchRecentSuggestions
@@ -23,7 +22,6 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
 import androidx.activity.OnBackPressedCallback
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
@@ -39,6 +37,7 @@ import androidx.media3.common.Player.STATE_READY
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.onNavDestinationSelected
@@ -50,6 +49,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
+import org.koin.androidx.scope.ScopeActivity
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.moire.ultrasonic.NavigationGraphDirections
 import org.moire.ultrasonic.R
@@ -63,7 +63,6 @@ import org.moire.ultrasonic.service.MediaPlayerManager
 import org.moire.ultrasonic.service.MusicServiceFactory
 import org.moire.ultrasonic.service.RxBus
 import org.moire.ultrasonic.service.plusAssign
-import org.moire.ultrasonic.subsonic.DownloadHandler
 import org.moire.ultrasonic.util.Constants
 import org.moire.ultrasonic.util.InfoDialog
 import org.moire.ultrasonic.util.LocaleHelper
@@ -81,7 +80,7 @@ import timber.log.Timber
  * onCreate/onResume/onDestroy methods...
  */
 @Suppress("TooManyFunctions")
-class NavigationActivity : AppCompatActivity() {
+class NavigationActivity : ScopeActivity() {
     private var videoMenuItem: MenuItem? = null
     private var chatMenuItem: MenuItem? = null
     private var bookmarksMenuItem: MenuItem? = null
@@ -96,6 +95,7 @@ class NavigationActivity : AppCompatActivity() {
     private var drawerLayout: DrawerLayout? = null
     private var host: NavHostFragment? = null
     private var selectServerButton: MaterialButton? = null
+    private var selectServerDropdownImage: ImageView? = null
     private var headerBackgroundImage: ImageView? = null
 
     // We store the last search string in this variable.
@@ -165,7 +165,7 @@ class NavigationActivity : AppCompatActivity() {
             drawerLayout
         )
 
-        setupActionBar(navController, appBarConfiguration)
+        setupActionBarWithNavController(navController, appBarConfiguration)
 
         setupNavigationMenu(navController)
 
@@ -204,10 +204,11 @@ class NavigationActivity : AppCompatActivity() {
         }
 
         rxBusSubscription += RxBus.playerStateObservable.subscribe {
-            if (it.state == STATE_READY)
+            if (it.state == STATE_READY) {
                 showNowPlaying()
-            else
+            } else {
                 hideNowPlaying()
+            }
         }
 
         rxBusSubscription += RxBus.themeChangedEventObservable.subscribe {
@@ -226,7 +227,7 @@ class NavigationActivity : AppCompatActivity() {
 
         // Setup app shortcuts on supported devices, but not on first start, when the server
         // is not configured yet.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && !UApp.instance!!.isFirstRun) {
+        if (!UApp.instance!!.isFirstRun) {
             ShortcutUtil.registerShortcuts(this)
         }
 
@@ -306,7 +307,7 @@ class NavigationActivity : AppCompatActivity() {
         Storage.reset()
 
         lifecycleScope.launch(Dispatchers.IO) {
-            Storage.ensureRootIsAvailable()
+            Storage.checkForErrorsWithCustomRoot()
         }
 
         setMenuForServerCapabilities()
@@ -314,8 +315,11 @@ class NavigationActivity : AppCompatActivity() {
         // 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()
+        }
     }
 
     /*
@@ -329,35 +333,31 @@ class NavigationActivity : AppCompatActivity() {
     }
 
     private fun updateNavigationHeaderForServer() {
-        // Only show the vector graphic on Android 11 or earlier
-        val showVectorBackground = (Build.VERSION.SDK_INT < Build.VERSION_CODES.S)
-
         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)
+            ServerColor.getForegroundColor(this, activeServer.color)
         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)
+        selectServerDropdownImage?.imageTintList = ColorStateList.valueOf(foregroundColor)
         headerBackgroundImage?.setBackgroundColor(backgroundColor)
-
-        // Hide the vector graphic on Android 12 or later
-        if (!showVectorBackground) {
-            headerBackgroundImage?.setImageDrawable(null)
-        }
     }
 
     private fun setupNavigationMenu(navController: NavController) {
@@ -402,26 +402,23 @@ class NavigationActivity : AppCompatActivity() {
 
         selectServerButton =
             navigationView?.getHeaderView(0)?.findViewById(R.id.header_select_server)
-        val dropDownButton: ImageView? =
+        selectServerDropdownImage =
             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)
         }
 
         selectServerButton?.setOnClickListener(onClick)
-        dropDownButton?.setOnClickListener(onClick)
+        selectServerDropdownImage?.setOnClickListener(onClick)
 
         headerBackgroundImage =
             navigationView?.getHeaderView(0)?.findViewById(R.id.img_header_bg)
     }
 
-    private fun setupActionBar(navController: NavController, appBarConfig: AppBarConfiguration) {
-        setupActionBarWithNavController(navController, appBarConfig)
-    }
-
     private val closeNavigationDrawerOnBack = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
             drawerLayout?.closeDrawer(GravityCompat.START)
@@ -438,19 +435,30 @@ class NavigationActivity : AppCompatActivity() {
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return item.onNavDestinationSelected(findNavController(R.id.nav_host_fragment)) ||
+        val navController = findNavController(R.id.nav_host_fragment)
+        // Check if this item ID exists in the nav graph
+        val destinationExists = navController.graph.findNode(item.itemId) != null
+        return if (destinationExists) {
+            item.onNavDestinationSelected(navController) || super.onOptionsItemSelected(item)
+        } else {
+            // Let the fragments handle their own menu items
             super.onOptionsItemSelected(item)
+        }
     }
 
-    // TODO: Why is this needed? Shouldn't it just work by default?
     override fun onSupportNavigateUp(): Boolean {
-        return findNavController(R.id.nav_host_fragment).navigateUp(appBarConfiguration)
+        // This override is required by design when using setupActionBarWithNavController()
+        // with an AppBarConfiguration. It ensures that the Up button behavior is correctly
+        // delegated — either navigating "up" in the back stack, or opening the drawer if
+        // we're at a top-level destination.
+        return findNavController(R.id.nav_host_fragment).navigateUp(appBarConfiguration) ||
+            super.onSupportNavigateUp()
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
 
-        when (intent?.action) {
+        when (intent.action) {
             Constants.INTENT_PLAY_RANDOM_SONGS -> {
                 playRandomSongs()
             }
@@ -473,7 +481,8 @@ class NavigationActivity : AppCompatActivity() {
     private fun handleSearchIntent(query: String?, autoPlay: Boolean) {
         val suggestions = SearchRecentSuggestions(
             this,
-            SearchSuggestionProvider.AUTHORITY, SearchSuggestionProvider.MODE
+            SearchSuggestionProvider.AUTHORITY,
+            SearchSuggestionProvider.MODE
         )
         suggestions.saveRecentQuery(query, null)
 
@@ -485,16 +494,19 @@ class NavigationActivity : AppCompatActivity() {
         val currentFragment = host?.childFragmentManager?.fragments?.last() ?: return
         val service = MusicServiceFactory.getMusicService()
         val musicDirectory = service.getRandomSongs(Settings.maxSongs)
-        val downloadHandler: DownloadHandler by inject()
+
-        downloadHandler.addTracksToMediaController(
+        mediaPlayerManager.addToPlaylist(
             songs = musicDirectory.getTracks(),
-            append = false,
-            playNext = false,
             autoPlay = true,
             shuffle = false,
-            fragment = currentFragment,
+            insertionMode = MediaPlayerManager.InsertionMode.CLEAR
-            playlistName = null
         )
+
+        if (Settings.shouldTransitionOnPlayback) {
+            currentFragment.findNavController().popBackStack(R.id.playerFragment, true)
+            currentFragment.findNavController().navigate(R.id.playerFragment)
+        }
+
         return
     }
 
@@ -525,7 +537,6 @@ class NavigationActivity : AppCompatActivity() {
 
     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,11 +32,11 @@ 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.ic_star_full
+    private val starDrawable: Int = R.drawable.rating_star_full
-    private val starHollowDrawable: Int = R.drawable.ic_star_hollow
+    private val starHollowDrawable: Int = R.drawable.rating_star_hollow
 
     open var layoutType = LayoutType.LIST
 
@@ -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/ArtistRowBinder.kt

@@ -17,6 +17,10 @@ import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.drakeet.multitype.ItemViewBinder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.moire.ultrasonic.R
@@ -63,16 +67,21 @@ class ArtistRowBinder(
 
         if (showArtistPicture()) {
             holder.coverArt.visibility = View.VISIBLE
-            val key = FileUtil.getArtistArtKey(item.name, false)
+            CoroutineScope(Dispatchers.IO).launch {
-            imageLoaderProvider.executeOn {
+                val key = FileUtil.getArtistArtKey(item.name, false)
-                it.loadImage(
+
-                    view = holder.coverArt,
+                withContext(Dispatchers.Main) {
-                    id = holder.coverArtId,
+                    imageLoaderProvider.executeOn {
-                    key = key,
+                        it.loadImage(
-                    large = false,
+                            view = holder.coverArt,
-                    size = 0,
+                            id = holder.coverArtId,
-                    defaultResourceId = R.drawable.ic_contact_picture
+                            key = key,
-                )
+                            large = false,
+                            size = 0,
+                            defaultResourceId = R.drawable.ic_contact_picture
+                        )
+                    }
+                }
             }
         } else {
             holder.coverArt.visibility = View.GONE

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.select_album_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

@@ -1,13 +1,18 @@
 package org.moire.ultrasonic.adapters
 
 import android.graphics.Color
+import android.graphics.drawable.LayerDrawable
+import android.os.Build
+import android.view.MenuInflater
 import android.view.View
 import android.widget.Checkable
 import android.widget.CheckedTextView
 import android.widget.ImageView
 import android.widget.LinearLayout
+import android.widget.PopupMenu
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.lifecycle.MutableLiveData
@@ -31,7 +36,7 @@ import org.moire.ultrasonic.service.RxBus
 import org.moire.ultrasonic.service.plusAssign
 import org.moire.ultrasonic.util.Settings
 import org.moire.ultrasonic.util.Util
-import timber.log.Timber
+import org.moire.ultrasonic.util.Util.themeColor
 
 const val INDICATOR_THICKNESS_INDEFINITE = 5
 const val INDICATOR_THICKNESS_DEFINITE = 10
@@ -51,17 +56,12 @@ class TrackViewHolder(val view: View) :
 
     var entry: Track? = null
         private set
-    var songLayout: LinearLayout = view.findViewById(R.id.song_layout)
+    private var songLayout: LinearLayout = view.findViewById(R.id.song_layout)
+
     var check: CheckedTextView = view.findViewById(R.id.song_check)
     var drag: ImageView = view.findViewById(R.id.song_drag)
     var observableChecked = MutableLiveData(false)
 
-    private var rating: LinearLayout = view.findViewById(R.id.song_rating)
-    private var fiveStar1: ImageView = view.findViewById(R.id.song_five_star_1)
-    private var fiveStar2: ImageView = view.findViewById(R.id.song_five_star_2)
-    private var fiveStar3: ImageView = view.findViewById(R.id.song_five_star_3)
-    private var fiveStar4: ImageView = view.findViewById(R.id.song_five_star_4)
-    private var fiveStar5: ImageView = view.findViewById(R.id.song_five_star_5)
     private var star: ImageView = view.findViewById(R.id.song_star)
     private var track: TextView = view.findViewById(R.id.song_track)
     private var title: TextView = view.findViewById(R.id.song_title)
@@ -79,20 +79,35 @@ class TrackViewHolder(val view: View) :
 
     private var rxBusSubscription: CompositeDisposable? = null
 
-    init {
-        Timber.v("New ViewHolder created")
-    }
-
     @Suppress("ComplexMethod")
-    fun setSong(
+    fun setSong(song: Track, checkable: Boolean, draggable: Boolean, isSelected: Boolean = false) {
-        song: Track,
-        checkable: Boolean,
-        draggable: Boolean,
-        isSelected: Boolean = false
-    ) {
-        val useFiveStarRating = Settings.useFiveStarRating
         entry = song
 
+        // Create new Disposable for the new Subscriptions
+        rxBusSubscription = CompositeDisposable()
+        rxBusSubscription!! += RxBus.playerStateObservable.subscribe {
+            setPlayIcon(it.track?.id == song.id && it.index == bindingAdapterPosition)
+        }
+
+        rxBusSubscription!! += RxBus.trackDownloadStateObservable.subscribe {
+            if (it.id != song.id) return@subscribe
+            updateStatus(it.state, it.progress)
+        }
+
+        // Listen for rating updates
+        rxBusSubscription!! += RxBus.ratingPublishedObservable.subscribe {
+            launch(Dispatchers.Main) {
+                // Ignore updates which are not for the current song
+                if (it.id != song.id) return@launch
+
+                if (it.rating is HeartRating) {
+                    updateRatingDisplay(song.userRating, it.rating.isHeart)
+                } else if (it.rating is StarRating) {
+                    updateRatingDisplay(it.rating.starRating.toInt(), song.starred)
+                }
+            }
+        }
+
         val entryDescription = Util.readableEntryDescription(song)
 
         artist.text = entryDescription.artist
@@ -113,7 +128,7 @@ class TrackViewHolder(val view: View) :
         if (ActiveServerProvider.isOffline()) {
             star.isGone = true
         } else {
-            setupStarButtons(song, useFiveStarRating)
+            setupRating(song)
         }
 
         // Instead of blocking the UI thread while looking up the current state,
@@ -125,41 +140,12 @@ class TrackViewHolder(val view: View) :
             )
         }
 
-        if (useFiveStarRating) {
+        updateRatingDisplay(entry!!.userRating, entry!!.starred)
-            updateFiveStars(entry?.userRating ?: 0)
-        } else {
-            updateSingleStar(entry!!.starred)
-        }
 
         if (song.isVideo) {
             artist.isGone = true
             progressIndicator.isGone = true
         }
-
-        // Create new Disposable for the new Subscriptions
-        rxBusSubscription = CompositeDisposable()
-        rxBusSubscription!! += RxBus.playerStateObservable.subscribe {
-            setPlayIcon(it.track?.id == song.id && it.index == bindingAdapterPosition)
-        }
-
-        rxBusSubscription!! += RxBus.trackDownloadStateObservable.subscribe {
-            if (it.id != song.id) return@subscribe
-            updateStatus(it.state, it.progress)
-        }
-
-        // Listen for rating updates
-        rxBusSubscription!! += RxBus.ratingPublishedObservable.subscribe {
-            launch(Dispatchers.Main) {
-                // Ignore updates which are not for the current song
-                if (it.id != song.id) return@launch
-
-                if (it.rating is HeartRating) {
-                    updateSingleStar(it.rating.isHeart)
-                } else if (it.rating is StarRating) {
-                    updateFiveStars(it.rating.starRating.toInt())
-                }
-            }
-        }
     }
 
     // This is called when the Holder is recycled and receives a new Song
@@ -176,7 +162,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)
@@ -184,62 +173,98 @@ 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
         }
     }
 
-    private fun setupStarButtons(track: Track, useFiveStarRating: Boolean) {
+    private fun setupRating(track: Track) {
-        if (useFiveStarRating) {
+        star.isVisible = true
-            // Hide single star
+        updateRatingDisplay(track.userRating, track.starred)
-            star.isGone = true
-            rating.isVisible = true
-            val rating = if (track.userRating == null) 0 else track.userRating!!
-            updateFiveStars(rating)
 
-            // Five star rating has no click handler because in the
+        star.setOnClickListener { toggleHeart(track) }
-            // track view theres not enough space
+        star.setOnLongClickListener { view -> showRatingPopup(view, track) }
-        } else {
+    }
-            star.isVisible = true
+
-            rating.isGone = true
+    private fun toggleHeart(track: Track) {
-            updateSingleStar(track.starred)
+        track.starred = !track.starred
-            star.setOnClickListener {
+        updateRatingDisplay(track.userRating, track.starred)
-                track.starred = !track.starred
+        RxBus.ratingSubmitter.onNext(
-                updateSingleStar(track.starred)
+            RatingUpdate(track.id, HeartRating(track.starred))
-                RxBus.ratingSubmitter.onNext(
+        )
-                    RatingUpdate(track.id, HeartRating(track.starred))
-                )
-            }
-        }
     }
 
     @Suppress("MagicNumber")
-    private fun updateFiveStars(rating: Int) {
+    private fun showRatingPopup(view: View, track: Track): Boolean {
-        fiveStar1.setImageResource(
+        val popup = PopupMenu(view.context, view)
-            if (rating > 0) R.drawable.ic_star_full else R.drawable.ic_star_hollow
+        val inflater: MenuInflater = popup.menuInflater
-        )
+        inflater.inflate(R.menu.rating, popup.menu)
-        fiveStar2.setImageResource(
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) popup.setForceShowIcon(true)
-            if (rating > 1) R.drawable.ic_star_full else R.drawable.ic_star_hollow
+
-        )
+        popup.setOnMenuItemClickListener {
-        fiveStar3.setImageResource(
+            val rating = when (it.itemId) {
-            if (rating > 2) R.drawable.ic_star_full else R.drawable.ic_star_hollow
+                R.id.popup_rate_1 -> 1
-        )
+                R.id.popup_rate_2 -> 2
-        fiveStar4.setImageResource(
+                R.id.popup_rate_3 -> 3
-            if (rating > 3) R.drawable.ic_star_full else R.drawable.ic_star_hollow
+                R.id.popup_rate_4 -> 4
-        )
+                R.id.popup_rate_5 -> 5
-        fiveStar5.setImageResource(
+                else -> 0
-            if (rating > 4) R.drawable.ic_star_full else R.drawable.ic_star_hollow
+            }
-        )
+            track.userRating = rating
+            updateRatingDisplay(track.userRating, track.starred)
+            RxBus.ratingSubmitter.onNext(
+                RatingUpdate(track.id, StarRating(5, rating.toFloat()))
+            )
+            true
+        }
+        popup.show()
+        return true
     }
 
-    private fun updateSingleStar(starred: Boolean) {
+    @Suppress("MagicNumber")
-        if (starred) {
+    private fun updateRatingDisplay(rating: Int?, starred: Boolean) {
-            star.setImageResource(R.drawable.ic_star_full)
+        val ratingDrawable = when (rating) {
-        } else {
+            1 -> R.drawable.rating_star_1
-            star.setImageResource(R.drawable.ic_star_hollow)
+            2 -> R.drawable.rating_star_2
+            3 -> R.drawable.rating_star_3
+            4 -> R.drawable.rating_star_4
+            5 -> R.drawable.rating_star_5
+            else -> {
+                R.drawable.rating_star_0
+            }
         }
+
+        val layers = if (starred) {
+            arrayOf(
+                ResourcesCompat.getDrawable(view.resources, ratingDrawable, null)!!,
+                ResourcesCompat.getDrawable(
+                    view.resources,
+                    R.drawable.rating_heart_mini_overlay,
+                    null
+                )!!
+            )
+        } else {
+            arrayOf(
+                ResourcesCompat.getDrawable(view.resources, ratingDrawable, null)!!
+            )
+        }
+
+        val ratingDisplay = LayerDrawable(layers)
+        ratingDisplay.getDrawable(0).setTint(
+            view.context.themeColor(com.google.android.material.R.attr.colorOnBackground)
+        )
+        if (starred) {
+            ratingDisplay.getDrawable(1).setTint(
+                view.context.themeColor(com.google.android.material.R.attr.colorTertiary)
+            )
+        }
+
+        star.setImageDrawable(ratingDisplay)
     }
 
     private fun updateStatus(status: DownloadState, progress: Int?) {
@@ -262,7 +287,8 @@ class TrackViewHolder(val view: View) :
                 showProgress()
             }
             DownloadState.RETRYING,
-            DownloadState.QUEUED -> {
+            DownloadState.QUEUED
+            -> {
                 showIndefiniteProgress()
             }
             else -> {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt

@@ -114,10 +114,8 @@ private fun VmPolicy.Builder.detectAllExceptSocket(): VmPolicy.Builder {
     detectLeakedClosableObjects()
     detectLeakedRegistrationObjects()
     detectFileUriExposure()
+    detectContentUriWithoutPermission()
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        detectContentUriWithoutPermission()
-    }
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
         detectCredentialProtectedWhileLocked()
     }

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

@@ -7,8 +7,6 @@
 
 package org.moire.ultrasonic.data
 
-import android.os.Handler
-import android.os.Looper
 import androidx.room.Room
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -53,7 +51,8 @@ class ActiveServerProvider(
                 }
                 Timber.d(
                     "getActiveServer retrieved from DataBase, id: %s cachedServer: %s",
-                    serverId, cachedServer
+                    serverId,
+                    cachedServer
                 )
             }
 
@@ -106,6 +105,30 @@ class ActiveServerProvider(
         }
     }
 
+    /**
+     * Sets the Active Server by its unique id
+     * @param serverId: The id of the desired server
+     */
+    fun setActiveServerById(serverId: Int) {
+        val oldServerId = Settings.activeServer
+        if (oldServerId == serverId) return
+
+        // Notify components about the change before actually resetting the MusicService
+        // so they can react by e.g. stopping playback on the old server
+        RxBus.activeServerChangingPublisher.onNext(oldServerId)
+
+        // Use a coroutine to post the server change to the end of the message queue
+        launch {
+            withContext(Dispatchers.Main) {
+                resetMusicService()
+                Settings.activeServer = serverId
+
+                RxBus.activeServerChangedPublisher.onNext(getActiveServer(serverId))
+                Timber.i("setActiveServerById done, new id: %s", serverId)
+            }
+        }
+    }
+
     @Synchronized
     fun getActiveMetaDatabase(): MetaDatabase {
         val activeServer = getActiveServerId()
@@ -136,7 +159,7 @@ class ActiveServerProvider(
             METADATA_DB + serverId
         )
             .addMigrations(META_MIGRATION_2_3)
-            .fallbackToDestructiveMigrationOnDowngrade()
+            .fallbackToDestructiveMigrationOnDowngrade(true)
             .build()
     }
 
@@ -234,29 +257,6 @@ class ActiveServerProvider(
             return Settings.activeServer
         }
 
-        /**
-         * Sets the Active Server by its unique id
-         * @param serverId: The id of the desired server
-         */
-        fun setActiveServerById(serverId: Int) {
-            val oldServerId = Settings.activeServer
-            if (oldServerId == serverId) return
-
-            // Notify components about the change before actually resetting the MusicService
-            // so they can react by e.g. stopping playback on the old server
-            RxBus.activeServerChangingPublisher.onNext(oldServerId)
-
-            // Post the server change to the end of the message queue,
-            // so the cleanup have time to finish
-            Handler(Looper.getMainLooper()).post {
-                resetMusicService()
-                Settings.activeServer = serverId
-
-                RxBus.activeServerChangedPublisher.onNext(serverId)
-                Timber.i("setActiveServerById done, new id: %s", serverId)
-            }
-        }
-
         /**
          * Queries if Scrobbling is enabled
          */

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

@@ -1,3 +1,12 @@
+/*
+ * AppDatabase.kt
+ * Copyright (C) 2009-2023 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
+@file:Suppress("ktlint:standard:max-line-length")
+
 package org.moire.ultrasonic.data
 
 import androidx.room.Database
@@ -31,8 +40,8 @@ val MIGRATION_1_2: Migration = object : Migration(1, 2) {
 }
 
 val MIGRATION_2_1: Migration = object : Migration(2, 1) {
-    override fun migrate(database: SupportSQLiteDatabase) {
+    override fun migrate(db: SupportSQLiteDatabase) {
-        database.execSQL(
+        db.execSQL(
             """
                 CREATE TABLE IF NOT EXISTS ServerSettingMigration (
                     id INTEGER NOT NULL PRIMARY KEY,
@@ -48,7 +57,7 @@ val MIGRATION_2_1: Migration = object : Migration(2, 1) {
                 )
             """.trimIndent()
         )
-        database.execSQL(
+        db.execSQL(
             """
                 INSERT INTO ServerSettingMigration (
                     id, [index], name, url, userName, password, jukeboxByDefault,
@@ -60,10 +69,10 @@ val MIGRATION_2_1: Migration = object : Migration(2, 1) {
                 FROM ServerSetting
             """.trimIndent()
         )
-        database.execSQL(
+        db.execSQL(
             "DROP TABLE ServerSetting"
         )
-        database.execSQL(
+        db.execSQL(
             "ALTER TABLE ServerSettingMigration RENAME TO ServerSetting"
         )
     }
@@ -87,8 +96,8 @@ val MIGRATION_2_3: Migration = object : Migration(2, 3) {
 }
 
 val MIGRATION_3_2: Migration = object : Migration(3, 2) {
-    override fun migrate(database: SupportSQLiteDatabase) {
+    override fun migrate(db: SupportSQLiteDatabase) {
-        database.execSQL(
+        db.execSQL(
             """
                 CREATE TABLE IF NOT EXISTS ServerSettingMigration (
                     id INTEGER NOT NULL PRIMARY KEY,
@@ -105,7 +114,7 @@ val MIGRATION_3_2: Migration = object : Migration(3, 2) {
                 )
             """.trimIndent()
         )
-        database.execSQL(
+        db.execSQL(
             """
                 INSERT INTO ServerSettingMigration (
                     id, [index], name, url, userName, password, jukeboxByDefault,
@@ -117,26 +126,26 @@ val MIGRATION_3_2: Migration = object : Migration(3, 2) {
                 FROM ServerSetting
             """.trimIndent()
         )
-        database.execSQL(
+        db.execSQL(
             "DROP TABLE ServerSetting"
         )
-        database.execSQL(
+        db.execSQL(
             "ALTER TABLE ServerSettingMigration RENAME TO ServerSetting"
         )
     }
 }
 
 val MIGRATION_3_4: Migration = object : Migration(3, 4) {
-    override fun migrate(database: SupportSQLiteDatabase) {
+    override fun migrate(db: SupportSQLiteDatabase) {
-        database.execSQL(
+        db.execSQL(
             "ALTER TABLE ServerSetting ADD COLUMN color INTEGER"
         )
     }
 }
 
 val MIGRATION_4_3: Migration = object : Migration(4, 3) {
-    override fun migrate(database: SupportSQLiteDatabase) {
+    override fun migrate(db: SupportSQLiteDatabase) {
-        database.execSQL(
+        db.execSQL(
             """
                 CREATE TABLE IF NOT EXISTS ServerSettingMigration (
                     id INTEGER NOT NULL PRIMARY KEY,
@@ -157,7 +166,7 @@ val MIGRATION_4_3: Migration = object : Migration(4, 3) {
                 )
             """.trimIndent()
         )
-        database.execSQL(
+        db.execSQL(
             """
                 INSERT INTO ServerSettingMigration (
                     id, [index], name, url, userName, password, jukeboxByDefault,
@@ -171,18 +180,18 @@ val MIGRATION_4_3: Migration = object : Migration(4, 3) {
                 FROM ServerSetting
             """.trimIndent()
         )
-        database.execSQL(
+        db.execSQL(
             "DROP TABLE ServerSetting"
         )
-        database.execSQL(
+        db.execSQL(
             "ALTER TABLE ServerSettingMigration RENAME TO ServerSetting"
         )
     }
 }
 
 val MIGRATION_4_5: Migration = object : Migration(4, 5) {
-    override fun migrate(database: SupportSQLiteDatabase) {
+    override fun migrate(db: SupportSQLiteDatabase) {
-        database.execSQL(
+        db.execSQL(
             """
                     CREATE TABLE IF NOT EXISTS `_new_ServerSetting` (
                     `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, 
@@ -204,7 +213,7 @@ val MIGRATION_4_5: Migration = object : Migration(4, 5) {
                     )
             """.trimIndent()
         )
-        database.execSQL(
+        db.execSQL(
             """
                     INSERT INTO `_new_ServerSetting` (
                     `ldapSupport`,`musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,
@@ -218,14 +227,14 @@ val MIGRATION_4_5: Migration = object : Migration(4, 5) {
                     FROM `ServerSetting`
             """.trimIndent()
         )
-        database.execSQL("DROP TABLE `ServerSetting`")
+        db.execSQL("DROP TABLE `ServerSetting`")
-        database.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`")
+        db.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`")
     }
 }
 
 val MIGRATION_5_4: Migration = object : Migration(5, 4) {
-    override fun migrate(database: SupportSQLiteDatabase) {
+    override fun migrate(db: SupportSQLiteDatabase) {
-        database.execSQL(
+        db.execSQL(
             """
                     CREATE TABLE IF NOT EXISTS `_new_ServerSetting` (
                     `id` INTEGER PRIMARY KEY NOT NULL, 
@@ -247,7 +256,7 @@ val MIGRATION_5_4: Migration = object : Migration(5, 4) {
                     )
             """.trimIndent()
         )
-        database.execSQL(
+        db.execSQL(
             """
                     INSERT INTO `_new_ServerSetting` (
                     `ldapSupport`,`musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,
@@ -261,25 +270,31 @@ val MIGRATION_5_4: Migration = object : Migration(5, 4) {
                     FROM `ServerSetting`
             """.trimIndent()
         )
-        database.execSQL("DROP TABLE `ServerSetting`")
+        db.execSQL("DROP TABLE `ServerSetting`")
-        database.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`")
+        db.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) {
+    override fun migrate(db: 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)")
+        db.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("DROP TABLE `ServerSetting`")
+        )
-        database.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`")
+        db.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`"
+        )
+        db.execSQL("DROP TABLE `ServerSetting`")
+        db.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`")
     }
 }
 val MIGRATION_6_5: Migration = object : Migration(6, 5) {
-    override fun migrate(database: SupportSQLiteDatabase) {
+    override fun migrate(db: 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)")
+        db.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("DROP TABLE `ServerSetting`")
+        )
-        database.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`")
+        db.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`"
+        )
+        db.execSQL("DROP TABLE `ServerSetting`")
+        db.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`")
     }
 }
-/* ktlint-enable max-line-length */

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

@@ -1,3 +1,10 @@
+/*
+ * BasicDaos.kt
+ * Copyright (C) 2009-2023 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
 package org.moire.ultrasonic.data
 
 import androidx.room.Dao
@@ -91,7 +98,7 @@ interface GenericDao<T> {
      */
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     @JvmSuppressWildcards
-    fun insertIgnoring(obj: List<T>?): List<Long>
+    fun insertIgnoring(obj: List<T>): List<Long>
 
     /**
      * Update an object from the database.
@@ -109,7 +116,7 @@ interface GenericDao<T> {
      */
     @Update
     @JvmSuppressWildcards
-    fun update(obj: List<T>?)
+    fun update(obj: List<T>)
 
     /**
      * Delete an object from the database

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

@@ -1,11 +1,11 @@
 /*
  * CachedDataSource.kt
- * Copyright (C) 2009-2022 Ultrasonic developers
+ * Copyright (C) 2009-2023 Ultrasonic developers
  *
  * Distributed under terms of the GNU GPLv3 license.
  */
 
-package org.moire.ultrasonic.playback
+package org.moire.ultrasonic.data
 
 import android.net.Uri
 import androidx.core.net.toUri
@@ -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

@@ -1,10 +1,12 @@
 /*
  * MetaDatabase.kt
- * Copyright (C) 2009-2022 Ultrasonic developers
+ * Copyright (C) 2009-2023 Ultrasonic developers
  *
  * 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,19 +69,27 @@ class Converters {
     }
 }
 
-/* ktlint-disable max-line-length */
 val META_MIGRATION_2_3: Migration = object : Migration(2, 3) {
-    override fun migrate(database: SupportSQLiteDatabase) {
+    override fun migrate(db: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE `albums`")
+        db.execSQL("DROP TABLE `albums`")
-        database.execSQL("DROP TABLE `indexes`")
+        db.execSQL("DROP TABLE `indexes`")
-        database.execSQL("DROP TABLE `artists`")
+        db.execSQL("DROP TABLE `artists`")
-        database.execSQL("DROP TABLE `tracks`")
+        db.execSQL("DROP TABLE `tracks`")
-        database.execSQL("DROP TABLE `music_folders`")
+        db.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`))")
+        db.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`))")
+        db.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`))"
+        )
+        db.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`))"
+        )
+        db.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`))"
+        )
+        db.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/AppPermanentStorageModule.kt

@@ -2,7 +2,7 @@ package org.moire.ultrasonic.di
 
 import androidx.room.Room
 import org.koin.android.ext.koin.androidContext
-import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.module.dsl.viewModel
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import org.moire.ultrasonic.data.AppDatabase

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

@@ -1,14 +1,15 @@
 package org.moire.ultrasonic.di
 
-import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 import org.moire.ultrasonic.data.ActiveServerProvider
 import org.moire.ultrasonic.subsonic.ImageLoaderProvider
+import org.moire.ultrasonic.util.CacheCleaner
 
 /**
  * This Koin module contains the registration of general classes needed for Ultrasonic
  */
 val applicationModule = module {
     single { ActiveServerProvider(get()) }
-    single { ImageLoaderProvider(androidContext()) }
+    single { ImageLoaderProvider() }
+    single { CacheCleaner() }
 }

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

@@ -5,15 +5,21 @@ import org.moire.ultrasonic.service.ExternalStorageMonitor
 import org.moire.ultrasonic.service.MediaPlayerLifecycleSupport
 import org.moire.ultrasonic.service.MediaPlayerManager
 import org.moire.ultrasonic.service.PlaybackStateSerializer
+import org.moire.ultrasonic.subsonic.NetworkAndStorageChecker
+import org.moire.ultrasonic.subsonic.ShareHandler
 
 /**
  * This Koin module contains the registration of classes related to the media player
  */
 val mediaPlayerModule = module {
-    single { MediaPlayerLifecycleSupport() }
+
+    // These are dependency-free
     single { PlaybackStateSerializer() }
     single { ExternalStorageMonitor() }
+    single { NetworkAndStorageChecker() }
+    single { ShareHandler() }
 
-    // TODO Ideally this can be cleaned up when all circular references are removed.
+    // These MUST be singletons, for the media playback must work headless (without an activity)
-    single { MediaPlayerManager(get(), get(), get()) }
+    single { MediaPlayerManager(get(), get()) }
+    single { MediaPlayerLifecycleSupport(get(), get(), get(), get()) }
 }

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

@@ -1,9 +1,9 @@
 @file:JvmName("MusicServiceModule")
+
 package org.moire.ultrasonic.di
 
 import kotlin.math.abs
 import okhttp3.logging.HttpLoggingInterceptor
-import org.koin.android.ext.koin.androidContext
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import org.moire.ultrasonic.BuildConfig
@@ -16,9 +16,6 @@ import org.moire.ultrasonic.service.CachedMusicService
 import org.moire.ultrasonic.service.MusicService
 import org.moire.ultrasonic.service.OfflineMusicService
 import org.moire.ultrasonic.service.RESTMusicService
-import org.moire.ultrasonic.subsonic.DownloadHandler
-import org.moire.ultrasonic.subsonic.NetworkAndStorageChecker
-import org.moire.ultrasonic.subsonic.ShareHandler
 import org.moire.ultrasonic.util.Constants
 
 /**
@@ -68,8 +65,4 @@ val musicServiceModule = module {
     single<MusicService>(named(OFFLINE_MUSIC_SERVICE)) {
         OfflineMusicService()
     }
-
-    single { DownloadHandler(get(), get()) }
-    single { NetworkAndStorageChecker(androidContext()) }
-    single { ShareHandler(androidContext()) }
 }

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/AboutFragment.kt

@@ -1,6 +1,6 @@
 /*
  * AboutFragment.kt
- * Copyright (C) 2009-2021 Ultrasonic developers
+ * Copyright (C) 2009-2023 Ultrasonic developers
  *
  * Distributed under terms of the GNU GPLv3 license.
  */
@@ -8,17 +8,16 @@
 package org.moire.ultrasonic.fragment
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
+import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import java.util.Locale
 import org.moire.ultrasonic.R
-import org.moire.ultrasonic.fragment.FragmentTitle.Companion.setTitle
 import org.moire.ultrasonic.util.Util.applyTheme
 import org.moire.ultrasonic.util.Util.getVersionName
 
@@ -56,18 +55,18 @@ class AboutFragment : Fragment() {
             versionName
         )
 
-        setTitle(this@AboutFragment, getString(R.string.menu_about))
+        FragmentTitle.setTitle(this@AboutFragment, getString(R.string.menu_about))
         titleText?.text = title
 
         webPageButton?.setOnClickListener {
             startActivity(
-                Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.about_webpage_url)))
+                Intent(Intent.ACTION_VIEW, getString(R.string.about_webpage_url).toUri())
             )
         }
 
         reportBugButton?.setOnClickListener {
             startActivity(
-                Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.about_report_url)))
+                Intent(Intent.ACTION_VIEW, getString(R.string.about_report_url).toUri())
             )
         }
     }

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

@@ -1,12 +1,10 @@
 /*
  * AlbumListFragment.kt
- * Copyright (C) 2009-2022 Ultrasonic developers
+ * Copyright (C) 2009-2023 Ultrasonic developers
  *
  * Distributed under terms of the GNU GPLv3 license.
  */
 
-@file:Suppress("NAME_SHADOWING")
-
 package org.moire.ultrasonic.fragment
 
 import android.os.Bundle
@@ -32,6 +30,7 @@ import org.moire.ultrasonic.domain.Album
 import org.moire.ultrasonic.model.AlbumListModel
 import org.moire.ultrasonic.util.LayoutType
 import org.moire.ultrasonic.util.Settings
+import org.moire.ultrasonic.util.toastingExceptionHandler
 import org.moire.ultrasonic.view.FilterButtonBar
 import org.moire.ultrasonic.view.SortOrder
 import org.moire.ultrasonic.view.ViewCapabilities
@@ -66,19 +65,17 @@ 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
     }
 
     private fun fetchAlbums(refresh: Boolean = navArgs.refresh, append: Boolean = navArgs.append) {
-
+        listModel.viewModelScope.launch(
-        listModel.viewModelScope.launch(handler) {
+            toastingExceptionHandler()
-            refreshListView?.isRefreshing = true
+        ) {
+            swipeRefresh?.isRefreshing = true
 
             if (navArgs.byArtist) {
                 listModel.getAlbumsOfArtist(
@@ -95,7 +92,7 @@ class AlbumListFragment(
                     refresh = refresh or append
                 )
             }
-            refreshListView?.isRefreshing = false
+            swipeRefresh?.isRefreshing = false
         }
     }
 
@@ -185,8 +182,8 @@ class AlbumListFragment(
         super.onViewCreated(view, savedInstanceState)
 
         // Setup refresh handler
-        refreshListView = view.findViewById(refreshListId)
+        swipeRefresh = view.findViewById(refreshListId)
-        refreshListView?.setOnRefreshListener {
+        swipeRefresh?.setOnRefreshListener {
             fetchAlbums(refresh = true)
         }
 

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

@@ -17,7 +17,6 @@ import org.moire.ultrasonic.NavigationGraphDirections
 import org.moire.ultrasonic.R
 import org.moire.ultrasonic.adapters.ArtistRowBinder
 import org.moire.ultrasonic.api.subsonic.models.AlbumListType
-import org.moire.ultrasonic.domain.Artist
 import org.moire.ultrasonic.domain.ArtistOrIndex
 import org.moire.ultrasonic.domain.Index
 import org.moire.ultrasonic.model.ArtistListModel
@@ -43,7 +42,7 @@ class ArtistListFragment : EntryListFragment<ArtistOrIndex>() {
      * The central function to pass a query to the model and return a LiveData object
      */
     override fun getLiveData(refresh: Boolean, append: Boolean): LiveData<List<ArtistOrIndex>> {
-        return listModel.getItems(navArgs.refresh || refresh, refreshListView!!)
+        return listModel.getItems(navArgs.refresh || refresh, swipeRefresh!!)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -70,7 +69,7 @@ class ArtistListFragment : EntryListFragment<ArtistOrIndex>() {
                 id = item.id,
                 name = item.name,
                 parentId = item.id,
-                isArtist = (item is Artist)
+                isArtist = false
             )
         } else {
             NavigationGraphDirections.toAlbumList(