Fix Kotlin 1.5 deprecated calls
This commit is contained in:
parent
71068fe635
commit
8aa1cf1e2c
|
@ -39,7 +39,7 @@ class PasswordMD5Interceptor(private val password: String) : Interceptor {
|
||||||
val md5Digest = MessageDigest.getInstance("MD5")
|
val md5Digest = MessageDigest.getInstance("MD5")
|
||||||
return md5Digest.digest(
|
return md5Digest.digest(
|
||||||
"$password$salt".toByteArray()
|
"$password$salt".toByteArray()
|
||||||
).toHexBytes().toLowerCase(Locale.getDefault())
|
).toHexBytes().lowercase(Locale.getDefault())
|
||||||
} catch (e: NoSuchAlgorithmException) {
|
} catch (e: NoSuchAlgorithmException) {
|
||||||
throw IllegalStateException(e)
|
throw IllegalStateException(e)
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,7 +96,7 @@ class ArtistRowAdapter(
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getSectionFromName(name: String): String {
|
private fun getSectionFromName(name: String): String {
|
||||||
var section = name.first().toUpperCase()
|
var section = name.first().uppercaseChar()
|
||||||
if (!section.isLetter()) section = '#'
|
if (!section.isLetter()) section = '#'
|
||||||
return section.toString()
|
return section.toString()
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,8 +66,8 @@ class OfflineMusicService : MusicService, KoinComponent {
|
||||||
val ignoredArticlesString = "The El La Los Las Le Les"
|
val ignoredArticlesString = "The El La Los Las Le Les"
|
||||||
val ignoredArticles = COMPILE.split(ignoredArticlesString)
|
val ignoredArticles = COMPILE.split(ignoredArticlesString)
|
||||||
artists.sortWith { lhsArtist, rhsArtist ->
|
artists.sortWith { lhsArtist, rhsArtist ->
|
||||||
var lhs = lhsArtist.name!!.toLowerCase(Locale.ROOT)
|
var lhs = lhsArtist.name!!.lowercase(Locale.ROOT)
|
||||||
var rhs = rhsArtist.name!!.toLowerCase(Locale.ROOT)
|
var rhs = rhsArtist.name!!.lowercase(Locale.ROOT)
|
||||||
val lhs1 = lhs[0]
|
val lhs1 = lhs[0]
|
||||||
val rhs1 = rhs[0]
|
val rhs1 = rhs[0]
|
||||||
if (Character.isDigit(lhs1) && !Character.isDigit(rhs1)) {
|
if (Character.isDigit(lhs1) && !Character.isDigit(rhs1)) {
|
||||||
|
@ -78,7 +78,7 @@ class OfflineMusicService : MusicService, KoinComponent {
|
||||||
}
|
}
|
||||||
for (article in ignoredArticles) {
|
for (article in ignoredArticles) {
|
||||||
var index = lhs.indexOf(
|
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) {
|
if (index == 0) {
|
||||||
lhs = lhs.substring(article.length + 1)
|
lhs = lhs.substring(article.length + 1)
|
||||||
|
@ -667,10 +667,10 @@ class OfflineMusicService : MusicService, KoinComponent {
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun matchCriteria(criteria: SearchCriteria, name: String?): Int {
|
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 queryParts = COMPILE.split(query)
|
||||||
val nameParts = COMPILE.split(
|
val nameParts = COMPILE.split(
|
||||||
name!!.toLowerCase(Locale.ROOT)
|
name!!.lowercase(Locale.ROOT)
|
||||||
)
|
)
|
||||||
var closeness = 0
|
var closeness = 0
|
||||||
for (queryPart in queryParts) {
|
for (queryPart in queryParts) {
|
||||||
|
|
Loading…
Reference in New Issue