highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-28 21:53:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes trying to parse empty addresses

Browse Source
This commit is contained in:
Vitor Pamplona
2025-07-22 10:34:09 -04:00
parent c7e81d1378
commit 8fe13717dd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/addressables/Address.kt
View File

@@ -63,8 +63,9 @@ data class Address(
) = "$kind:$pubKeyHex:$dTag" ) = "$kind:$pubKeyHex:$dTag"
@JvmStatic @JvmStatic
fun parse(addressId: String): Address? = fun parse(addressId: String): Address? {
try { if (addressId.isBlank()) return null
return try {
val parts = addressId.split(":", limit = 3) val parts = addressId.split(":", limit = 3)
if (parts.size > 2 && parts[1].length == 64 && Hex.isHex(parts[1])) { if (parts.size > 2 && parts[1].length == 64 && Hex.isHex(parts[1])) {
Address(parts[0].toInt(), parts[1], parts.getOrNull(2) ?: "") Address(parts[0].toInt(), parts[1], parts.getOrNull(2) ?: "")
@@ -74,11 +75,11 @@ data class Address(
if (addr is NAddress) { if (addr is NAddress) {
addr.address() addr.address()
} else { } else {
Log.w("AddressableId", "Error parsing. Pubkey is not hex: $addressId") Log.w("AddressableId", "Error parsing. naddr1 seems invalid: $addressId")
null null
} }
} else { } else {
Log.w("AddressableId", "Error parsing. Pubkey is not hex: $addressId") Log.w("AddressableId", "Error parsing. Not a valid address: $addressId")
null null
} }
} }
@@ -86,6 +87,7 @@ data class Address(
Log.e("AddressableId", "Error parsing: $addressId: ${t.message}", t) Log.e("AddressableId", "Error parsing: $addressId: ${t.message}", t)
null null
} }
}
fun isOfKind( fun isOfKind(
addressId: String, addressId: String,