mirror of
https://github.com/greenart7c3/Amber.git
synced 2026-10-05 19:08:23 +00:00
Fix a crash when auth event has no relay tags
This commit is contained in:
@@ -101,6 +101,6 @@ open class AmberEvent(
|
||||
|
||||
fun fromJson(json: String): AmberEvent = mapper.readValue(json, AmberEvent::class.java)
|
||||
|
||||
fun relay(event: Event): String = event.tags.filter { it.size > 1 && it[0] == "relay" }.map { it[1] }.first()
|
||||
fun relay(event: Event): String? = event.tags.filter { it.size > 1 && it[0] == "relay" }.map { it[1] }.firstOrNull()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -123,7 +123,7 @@ fun SeeDetailsScreen(
|
||||
|
||||
val data = if (intent.type == SignerType.SIGN_EVENT) {
|
||||
val event = intent.event!!
|
||||
if (event.kind == 22242) AmberEvent.relay(event) else event.content
|
||||
if (event.kind == 22242) AmberEvent.relay(event) ?: event.content else event.content
|
||||
} else {
|
||||
if (type.name.contains("ENCRYPT") && intent.encryptedData is ClearTextEncryptedDataKind) {
|
||||
intent.encryptedData.text
|
||||
@@ -188,7 +188,7 @@ fun SeeDetailsScreen(
|
||||
|
||||
val data = if (bunkerRequest.request is BunkerRequestSign) {
|
||||
val event = bunkerRequest.signedEvent!!
|
||||
if (event.kind == 22242) AmberEvent.relay(event) else event.content
|
||||
if (event.kind == 22242) AmberEvent.relay(event) ?: event.content else event.content
|
||||
} else {
|
||||
if (type.name.contains("ENCRYPT") && bunkerRequest.encryptedData is ClearTextEncryptedDataKind) {
|
||||
bunkerRequest.encryptedData.text
|
||||
|
||||
Reference in New Issue
Block a user