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

Merge pull request #1465 from greenart7c3/main

Browse Source 
When using intents check if it's rejected
This commit is contained in:
Vitor Pamplona
2025-09-08 13:25:19 -04:00
committed by GitHub
parent 4c1d0ac60c 196a7de6a3
commit f633d57277
10 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/DecryptZapResponse.kt
View File

@@ -34,6 +34,9 @@ class DecryptZapResponse {
)
fun parse(intent: IntentResult): SignerResult.RequestAddressed<ZapEventDecryptionResult> {
if (intent.rejected) {
return SignerResult.RequestAddressed.ManuallyRejected()
}
val eventJson = intent.result
return if (!eventJson.isNullOrBlank()) {
if (eventJson.startsWith("{")) {

3
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/DeriveKeyResponse.kt
View File

@@ -33,6 +33,9 @@ class DeriveKeyResponse {
)
fun parse(intent: IntentResult): SignerResult.RequestAddressed<DerivationResult> {
if (intent.rejected) {
return SignerResult.RequestAddressed.ManuallyRejected()
}
val newPrivateKey = intent.result
return if (newPrivateKey != null) {
SignerResult.RequestAddressed.Successful(DerivationResult(newPrivateKey))

3
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/Nip04DecryptResponse.kt
View File

@@ -32,6 +32,9 @@ class Nip04DecryptResponse {
)
fun parse(intent: IntentResult): SignerResult.RequestAddressed<DecryptionResult> {
if (intent.rejected) {
return SignerResult.RequestAddressed.ManuallyRejected()
}
val plaintext = intent.result
return if (plaintext != null) {
SignerResult.RequestAddressed.Successful(DecryptionResult(plaintext))

4
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/Nip04EncryptResponse.kt
View File

@@ -32,6 +32,10 @@ class Nip04EncryptResponse {
)
fun parse(intent: IntentResult): SignerResult.RequestAddressed<EncryptionResult> {
if (intent.rejected) {
return SignerResult.RequestAddressed.ManuallyRejected()
}
val ciphertext = intent.result
return if (ciphertext != null) {
SignerResult.RequestAddressed.Successful(EncryptionResult(ciphertext))

3
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/Nip44DecryptResponse.kt
View File

@@ -32,6 +32,9 @@ class Nip44DecryptResponse {
)
fun parse(intent: IntentResult): SignerResult.RequestAddressed<DecryptionResult> {
if (intent.rejected) {
return SignerResult.RequestAddressed.ManuallyRejected()
}
val plaintext = intent.result
return if (plaintext != null) {
SignerResult.RequestAddressed.Successful(DecryptionResult(plaintext))

3
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/Nip44EncryptResponse.kt
View File

@@ -32,6 +32,9 @@ class Nip44EncryptResponse {
)
fun parse(intent: IntentResult): SignerResult.RequestAddressed<EncryptionResult> {
if (intent.rejected) {
return SignerResult.RequestAddressed.ManuallyRejected()
}
val ciphertext = intent.result
return if (ciphertext != null) {
SignerResult.RequestAddressed.Successful(EncryptionResult(ciphertext))

4
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/SignResponse.kt
View File

@@ -39,6 +39,10 @@ class SignResponse {
intent: IntentResult,
unsignedEvent: Event,
): SignerResult.RequestAddressed<SignResult> {
if (intent.rejected) {
return SignerResult.RequestAddressed.ManuallyRejected()
}
val eventJson = intent.event
return if (eventJson != null) {
if (eventJson.startsWith("{")) {

2
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/results/IntentResult.kt
View File

@@ -29,6 +29,7 @@ data class IntentResult(
val result: String? = null,
val event: String? = null,
val id: String? = null,
val rejected: Boolean = false,
) {
fun toJson(): String = JsonMapper.mapper.writeValueAsString(this)
@@ -48,6 +49,7 @@ data class IntentResult(
result = data.getStringExtra("result"),
event = data.getStringExtra("event"),
`package` = data.getStringExtra("package"),
rejected = data.extras?.containsKey("rejected") == true,
)
fun fromJson(json: String): IntentResult = JsonMapper.mapper.readValue<IntentResult>(json)

1
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/results/IntentResultJsonDeserializer.kt
View File

@@ -36,6 +36,7 @@ class IntentResultJsonDeserializer : StdDeserializer<IntentResult>(IntentResult:
result = jsonObject.get("result")?.asText()?.intern(),
event = jsonObject.get("event")?.asText()?.intern(),
id = jsonObject.get("id")?.asText()?.intern(),
rejected = jsonObject.get("rejected")?.asBoolean() ?: false,
)
}
}

1
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/results/IntentResultJsonSerializer.kt
View File

@@ -35,6 +35,7 @@ class IntentResultJsonSerializer : StdSerializer<IntentResult>(IntentResult::cla
result.result?.let { gen.writeStringField("result", it) }
result.event?.let { gen.writeStringField("event", it) }
result.id?.let { gen.writeStringField("id", it) }
result.rejected.let { gen.writeBooleanField("rejected", it) }
gen.writeEndObject()
}
}