Completing Intent writing implementation

quartz/src/main/java/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/DecryptZapResponse.kt

@@ -20,7 +20,6 @@
  */
 package com.vitorpamplona.quartz.nip55AndroidSigner.api.foreground.intents.responses
 
-import android.content.Intent
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.SignerResult
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.ZapEventDecryptionResult
@@ -29,11 +28,10 @@ import com.vitorpamplona.quartz.nip57Zaps.LnZapPrivateEvent
 
 class DecryptZapResponse {
     companion object {
-        fun assemble(event: LnZapPrivateEvent): Intent {
+        fun assemble(event: LnZapPrivateEvent): IntentResult =
-            val intent = Intent()
+            IntentResult(
-            intent.putExtra("result", event.toJson())
+                result = event.toJson(),
-            return intent
+            )
-        }
 
         fun parse(intent: IntentResult): SignerResult.RequestAddressed<ZapEventDecryptionResult> {
             val eventJson = intent.result

quartz/src/main/java/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/DeriveKeyResponse.kt

@@ -20,12 +20,18 @@
  */
 package com.vitorpamplona.quartz.nip55AndroidSigner.api.foreground.intents.responses
 
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.DerivationResult
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.SignerResult
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.foreground.intents.results.IntentResult
 
 class DeriveKeyResponse {
     companion object {
+        fun assemble(newPrivateKey: HexKey): IntentResult =
+            IntentResult(
+                result = newPrivateKey,
+            )
+
         fun parse(intent: IntentResult): SignerResult.RequestAddressed<DerivationResult> {
             val newPrivateKey = intent.result
             return if (newPrivateKey != null) {

quartz/src/main/java/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/LoginResponse.kt

@@ -20,12 +20,22 @@
  */
 package com.vitorpamplona.quartz.nip55AndroidSigner.api.foreground.intents.responses
 
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.PubKeyResult
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.SignerResult
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.foreground.intents.results.IntentResult
 
 class LoginResponse {
     companion object {
+        fun assemble(
+            pubkey: HexKey,
+            packageName: String,
+        ): IntentResult =
+            IntentResult(
+                result = pubkey,
+                `package` = packageName,
+            )
+
         fun parse(intent: IntentResult): SignerResult.RequestAddressed<PubKeyResult> {
             val pubkey = intent.result
             val packageName = intent.`package`

quartz/src/main/java/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/Nip04DecryptResponse.kt

@@ -26,10 +26,15 @@ import com.vitorpamplona.quartz.nip55AndroidSigner.api.foreground.intents.result
 
 class Nip04DecryptResponse {
     companion object {
+        fun assemble(plaintext: String): IntentResult =
+            IntentResult(
+                result = plaintext,
+            )
+
         fun parse(intent: IntentResult): SignerResult.RequestAddressed<DecryptionResult> {
-            val ciphertext = intent.result
+            val plaintext = intent.result
-            return if (ciphertext != null) {
+            return if (plaintext != null) {
-                SignerResult.RequestAddressed.Successful(DecryptionResult(ciphertext))
+                SignerResult.RequestAddressed.Successful(DecryptionResult(plaintext))
             } else {
                 SignerResult.RequestAddressed.ReceivedButCouldNotPerform()
             }

quartz/src/main/java/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/Nip04EncryptResponse.kt

@@ -26,6 +26,11 @@ import com.vitorpamplona.quartz.nip55AndroidSigner.api.foreground.intents.result
 
 class Nip04EncryptResponse {
     companion object {
+        fun assemble(ciphertext: String): IntentResult =
+            IntentResult(
+                result = ciphertext,
+            )
+
         fun parse(intent: IntentResult): SignerResult.RequestAddressed<EncryptionResult> {
             val ciphertext = intent.result
             return if (ciphertext != null) {

quartz/src/main/java/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/Nip44DecryptResponse.kt

@@ -26,10 +26,15 @@ import com.vitorpamplona.quartz.nip55AndroidSigner.api.foreground.intents.result
 
 class Nip44DecryptResponse {
     companion object {
+        fun assemble(plaintext: String): IntentResult =
+            IntentResult(
+                result = plaintext,
+            )
+
         fun parse(intent: IntentResult): SignerResult.RequestAddressed<DecryptionResult> {
-            val ciphertext = intent.result
+            val plaintext = intent.result
-            return if (ciphertext != null) {
+            return if (plaintext != null) {
-                SignerResult.RequestAddressed.Successful(DecryptionResult(ciphertext))
+                SignerResult.RequestAddressed.Successful(DecryptionResult(plaintext))
             } else {
                 SignerResult.RequestAddressed.ReceivedButCouldNotPerform()
             }

quartz/src/main/java/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/Nip44EncryptResponse.kt

@@ -26,6 +26,11 @@ import com.vitorpamplona.quartz.nip55AndroidSigner.api.foreground.intents.result
 
 class Nip44EncryptResponse {
     companion object {
+        fun assemble(ciphertext: String): IntentResult =
+            IntentResult(
+                result = ciphertext,
+            )
+
         fun parse(intent: IntentResult): SignerResult.RequestAddressed<EncryptionResult> {
             val ciphertext = intent.result
             return if (ciphertext != null) {

quartz/src/main/java/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/responses/SignResponse.kt

@@ -29,6 +29,12 @@ import com.vitorpamplona.quartz.nip55AndroidSigner.api.foreground.intents.result
 
 class SignResponse {
     companion object {
+        fun assemble(event: Event): IntentResult =
+            IntentResult(
+                event = event.toJson(),
+                result = event.sig,
+            )
+
         fun parse(
             intent: IntentResult,
             unsignedEvent: Event,

quartz/src/main/java/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/results/IntentResult.kt

@@ -24,11 +24,11 @@ import android.content.Intent
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.quartz.nip01Core.jackson.JsonMapper
 
-class IntentResult(
+data class IntentResult(
-    val `package`: String?,
+    val `package`: String? = null,
-    val result: String?,
+    val result: String? = null,
-    val event: String?,
+    val event: String? = null,
-    val id: String?,
+    val id: String? = null,
 ) {
     fun toJson(): String = JsonMapper.mapper.writeValueAsString(this)