Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix Kotlin 1.5 deprecated calls

This commit is contained in:
tzugen 2021-05-28 20:32:31 +02:00
parent 71068fe635
commit 8aa1cf1e2c
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordMD5Interceptor.kt
View File

@ -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)
}

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistRowAdapter.kt
View File

@ -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()
}

10
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt
View File

@ -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) {