From 8aa1cf1e2cdcbe23f052b2a6e186da768c0357c4 Mon Sep 17 00:00:00 2001
From: tzugen <tzugen@riseup.net>
Date: Fri, 28 May 2021 20:32:31 +0200
Subject: [PATCH] Fix Kotlin 1.5 deprecated calls

---
 .../subsonic/interceptors/PasswordMD5Interceptor.kt    |  2 +-
 .../org/moire/ultrasonic/fragment/ArtistRowAdapter.kt  |  2 +-
 .../moire/ultrasonic/service/OfflineMusicService.kt    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordMD5Interceptor.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordMD5Interceptor.kt
index 75d6a48e..8a1c8388 100644
--- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordMD5Interceptor.kt
+++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordMD5Interceptor.kt
@@ -39,7 +39,7 @@ class PasswordMD5Interceptor(private val password: String) : Interceptor {
             val md5Digest = MessageDigest.getInstance("MD5")
             return md5Digest.digest(
                 "$password$salt".toByteArray()
-            ).toHexBytes().toLowerCase(Locale.getDefault())
+            ).toHexBytes().lowercase(Locale.getDefault())
         } catch (e: NoSuchAlgorithmException) {
             throw IllegalStateException(e)
         }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistRowAdapter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistRowAdapter.kt
index 30f76f4e..2e312225 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistRowAdapter.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistRowAdapter.kt
@@ -96,7 +96,7 @@ class ArtistRowAdapter(
     }
 
     private fun getSectionFromName(name: String): String {
-        var section = name.first().toUpperCase()
+        var section = name.first().uppercaseChar()
         if (!section.isLetter()) section = '#'
         return section.toString()
     }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt
index 6afed13d..f1fc7f43 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt
@@ -66,8 +66,8 @@ class OfflineMusicService : MusicService, KoinComponent {
         val ignoredArticlesString = "The El La Los Las Le Les"
         val ignoredArticles = COMPILE.split(ignoredArticlesString)
         artists.sortWith { lhsArtist, rhsArtist ->
-            var lhs = lhsArtist.name!!.toLowerCase(Locale.ROOT)
-            var rhs = rhsArtist.name!!.toLowerCase(Locale.ROOT)
+            var lhs = lhsArtist.name!!.lowercase(Locale.ROOT)
+            var rhs = rhsArtist.name!!.lowercase(Locale.ROOT)
             val lhs1 = lhs[0]
             val rhs1 = rhs[0]
             if (Character.isDigit(lhs1) && !Character.isDigit(rhs1)) {
@@ -78,7 +78,7 @@ class OfflineMusicService : MusicService, KoinComponent {
             }
             for (article in ignoredArticles) {
                 var index = lhs.indexOf(
-                    String.format(Locale.ROOT, "%s ", article.toLowerCase(Locale.ROOT))
+                    String.format(Locale.ROOT, "%s ", article.lowercase(Locale.ROOT))
                 )
                 if (index == 0) {
                     lhs = lhs.substring(article.length + 1)
@@ -667,10 +667,10 @@ class OfflineMusicService : MusicService, KoinComponent {
         }
 
         private fun matchCriteria(criteria: SearchCriteria, name: String?): Int {
-            val query = criteria.query.toLowerCase(Locale.ROOT)
+            val query = criteria.query.lowercase(Locale.ROOT)
             val queryParts = COMPILE.split(query)
             val nameParts = COMPILE.split(
-                name!!.toLowerCase(Locale.ROOT)
+                name!!.lowercase(Locale.ROOT)
             )
             var closeness = 0
             for (queryPart in queryParts) {