From 24dbd04ca6d261322256694320d48ad58e288f20 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Wed, 10 Jul 2024 06:51:32 -0600
Subject: [PATCH 1/2] music: fix broken name comparator

---
 app/src/main/java/org/oxycblt/auxio/music/info/Name.kt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/music/info/Name.kt b/app/src/main/java/org/oxycblt/auxio/music/info/Name.kt
index 30626f01e..3f5662b8d 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/info/Name.kt
+++ b/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.
-                    sortTokens.zip(other.sortTokens).fold(0) { acc, (token, otherToken) ->
+                    val result = 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
             }
 

From cf887cacb7ccab227ae9c3b77efcd3cd9349e28e Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Wed, 10 Jul 2024 06:54:39 -0600
Subject: [PATCH 2/2] build: bump to 3.5.2

Bump to version 3.5.2 (48).
---
 CHANGELOG.md                                      | 5 +++++
 README.md                                         | 4 ++--
 app/build.gradle                                  | 4 ++--
 fastlane/metadata/android/en-US/changelogs/48.txt | 3 +++
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/48.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d4b66905..906d311b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.5.2
+
+#### What's Fixed
+- Fixed music loading failure from improper sort systems (For real this time)
+
 ## 3.5.1
 
 #### What's Fixed
diff --git a/README.md b/README.md
index 93bf8e848..6a3e6a632 100644
--- a/README.md
+++ b/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">
-        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v3.5.1&color=64B5F6&style=flat">
+    <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.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">
diff --git a/app/build.gradle b/app/build.gradle
index 206f0c14b..fd4bfacc9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@ android {
 
     defaultConfig {
         applicationId namespace
-        versionName "3.5.1"
-        versionCode 47
+        versionName "3.5.2"
+        versionCode 48
 
         minSdk 24
         targetSdk 34
diff --git a/fastlane/metadata/android/en-US/changelogs/48.txt b/fastlane/metadata/android/en-US/changelogs/48.txt
new file mode 100644
index 000000000..44e3fc9d1
--- /dev/null
+++ b/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
\ No newline at end of file