Merge branch 'master' into playback

Version 3.5.2

CHANGELOG.md

@@ -15,6 +15,11 @@
 - Excessive CPU no longer spent showing music loading process
 - Fixed playback sheet flickering on warm start
 
+## 3.5.2
+
+#### What's Fixed
+- Fixed music loading failure from improper sort systems (For real this time)
+
 ## 3.5.1
 
 #### What's Fixed

README.md

@@ -2,8 +2,8 @@
 <h1 align="center"><b>Auxio</b></h1>
 <h4 align="center">A simple, rational music player for android.</h4>
 <p align="center">
-    <a href="https://github.com/oxygencobalt/Auxio/releases/tag/v3.5.1">
+    <a href="https://github.com/oxygencobalt/Auxio/releases/tag/v3.5.2">
-        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v3.5.1&color=64B5F6&style=flat">
+        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v3.5.2&color=64B5F6&style=flat">
     </a>
     <a href="https://github.com/oxygencobalt/Auxio/releases/">
         <img alt="Releases" src="https://img.shields.io/github/downloads/OxygenCobalt/Auxio/total.svg?color=4B95DE&style=flat">

app/build.gradle

@@ -21,8 +21,8 @@ android {
 
     defaultConfig {
         applicationId namespace
-        versionName "3.5.1"
+        versionName "3.5.2"
-        versionCode 47
+        versionCode 48
 
         minSdk 24
         targetSdk 34

app/src/main/java/org/oxycblt/auxio/music/info/Name.kt

@@ -70,12 +70,11 @@ sealed interface Name : Comparable<Name> {
         final override fun compareTo(other: Name) =
             when (other) {
                 is Known -> {
-                    // Progressively compare the sort tokens between each known name.
+                    val result = sortTokens.zip(other.sortTokens).fold(0) { acc, (token, otherToken) ->
-                    sortTokens.zip(other.sortTokens).fold(0) { acc, (token, otherToken) ->
                         acc.takeIf { it != 0 } ?: token.compareTo(otherToken)
                     }
+                    if (result != 0) result else sortTokens.size.compareTo(other.sortTokens.size)
                 }
-                // Unknown names always come before known names.
                 is Unknown -> 1
             }
 

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

@@ -0,0 +1,3 @@
+Auxio 3.5.0 adds support for android auto alongside various playback and music quality of life improvements.
+This release fixes a critical bug with the music loader.
+For more information, see https://github.com/OxygenCobalt/Auxio/releases/tag/v3.5.2