diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt index c80f7707e..49471bf4a 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt @@ -56,7 +56,7 @@ object UrlCachedPreviewer { fun preloadPreviewsFor(note: Note) { note.event?.content?.let { findUrlsInMessage(it).forEach { - val removedParamsFromUrl = it.split("?")[0].toLowerCase() + val removedParamsFromUrl = it.split("?")[0].lowercase() if (imageExtension.matcher(removedParamsFromUrl).matches()) { // Preload Images? Isn't this too heavy? } else if (videoExtension.matcher(removedParamsFromUrl).matches()) { @@ -69,4 +69,4 @@ object UrlCachedPreviewer { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt index d0f0e41f0..4c631cbda 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt @@ -259,7 +259,7 @@ class User(val pubkeyHex: String) { info?.latestMetadata = latestMetadata info?.updatedMetadataAt = latestMetadata.createdAt - if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.toLowerCase()?.startsWith("lnurl") == true) { + if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.lowercase()?.startsWith("lnurl") == true) { try { val url = String(Bech32.decodeBytes(newUserInfo.lud06!!, false).second) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt index 376495cfd..7d3fe774d 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt @@ -24,7 +24,7 @@ class LightningAddressResolver { return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}" } - if (lnaddress.toLowerCase().startsWith("lnurl")) { + if (lnaddress.lowercase().startsWith("lnurl")) { return try { String(Bech32.decodeBytes(lnaddress, false).second) } catch (e: Exception) { @@ -160,4 +160,4 @@ class LightningAddressResolver { onError = onError ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LnInvoiceUtil.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LnInvoiceUtil.kt index 822ab04a3..18f730270 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LnInvoiceUtil.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LnInvoiceUtil.kt @@ -128,7 +128,7 @@ object LnInvoiceUtil { } private fun multiplier(multiplier: String): BigDecimal { - return when (multiplier.toLowerCase()) { + return when (multiplier.lowercase()) { "m" -> BigDecimal("0.001") "u" -> BigDecimal("0.000001") "n" -> BigDecimal("0.000000001") @@ -153,4 +153,4 @@ object LnInvoiceUtil { matcher.group() } else null } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/ReportEvent.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/model/ReportEvent.kt index 4eebabae6..6e10f5b5e 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/ReportEvent.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/ReportEvent.kt @@ -56,8 +56,8 @@ class ReportEvent ( fun create(reportedPost: Event, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent { val content = "" - val reportPostTag = listOf("e", reportedPost.id, type.name.toLowerCase()) - val reportAuthorTag = listOf("p", reportedPost.pubKey, type.name.toLowerCase()) + val reportPostTag = listOf("e", reportedPost.id, type.name.lowercase()) + val reportAuthorTag = listOf("p", reportedPost.pubKey, type.name.lowercase()) val pubKey = Utils.pubkeyCreate(privateKey).toHexKey() var tags:List> = listOf(reportPostTag, reportAuthorTag) @@ -74,7 +74,7 @@ class ReportEvent ( fun create(reportedUser: String, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent { val content = "" - val reportAuthorTag = listOf("p", reportedUser, type.name.toLowerCase()) + val reportAuthorTag = listOf("p", reportedUser, type.name.lowercase()) val pubKey = Utils.pubkeyCreate(privateKey).toHexKey() val tags:List> = listOf(reportAuthorTag) @@ -92,4 +92,4 @@ class ReportEvent ( NUDITY, PROFANITY, } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/TypedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/TypedFilter.kt index f31603760..39816b50e 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/TypedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/TypedFilter.kt @@ -22,7 +22,7 @@ class TypedFilter( } fun typesToJson(types: Set): JsonArray { - return JsonArray().apply { types.forEach { add(it.name.toLowerCase()) } } + return JsonArray().apply { types.forEach { add(it.name.lowercase()) } } } fun filterToJson(filter: JsonFilter): JsonObject { @@ -52,4 +52,4 @@ class TypedFilter( } return jsonObject } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt index 8d1ca4633..f903635fa 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt @@ -155,7 +155,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n Row(modifier = Modifier.padding(top = 5.dp)) { if (isValidURL(myUrlPreview)) { val removedParamsFromUrl = - myUrlPreview.split("?")[0].toLowerCase() + myUrlPreview.split("?")[0].lowercase() if (imageExtension.matcher(removedParamsFromUrl).matches()) { AsyncImage( model = myUrlPreview, diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt index 36b380cad..79706fe34 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt @@ -141,7 +141,7 @@ fun RichTextViewer( if (lnInvoice != null) { InvoicePreview(lnInvoice) } else if (isValidURL(word)) { - val removedParamsFromUrl = word.split("?")[0].toLowerCase() + val removedParamsFromUrl = word.split("?")[0].lowercase() if (imageExtension.matcher(removedParamsFromUrl).matches()) { ZoomableImageView(word) } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {