From 9ce14e08fd3e2fe5f2849dedff3297f0f5bf551a Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 12 Apr 2024 10:56:38 -0400
Subject: [PATCH] Fixes a bug with signature-null in the `sig` of events.

---
 .../quartz/signers/ExternalSignerLauncher.kt              | 8 ++++----
 .../vitorpamplona/quartz/signers/NostrSignerExternal.kt   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt b/quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt
index 8b0cad500..c4ac38450 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt
@@ -125,20 +125,20 @@ class ExternalSignerLauncher(
             val localResults: Array<Result> = Result.fromJsonArray(results)
             localResults.forEach {
                 val signature = it.signature ?: ""
-                val packageName = it.`package` ?: ""
+                val packageName = it.`package`?.let { "-$it" } ?: ""
                 val id = it.id ?: ""
                 if (id.isNotBlank()) {
-                    val result = if (packageName.isNotBlank()) "$signature-$packageName" else signature
+                    val result = if (packageName.isNotBlank()) "$signature$packageName" else signature
                     val contentCache = contentCache.get(id)
                     contentCache?.invoke(result)
                 }
             }
         } else {
             val signature = data.getStringExtra("signature") ?: ""
-            val packageName = data.getStringExtra("package") ?: ""
+            val packageName = data.getStringExtra("package")?.let { "-$it" } ?: ""
             val id = data.getStringExtra("id") ?: ""
             if (id.isNotBlank()) {
-                val result = if (packageName.isNotBlank()) "$signature-$packageName" else signature
+                val result = if (packageName.isNotBlank()) "$signature$packageName" else signature
                 val contentCache = contentCache.get(id)
                 contentCache?.invoke(result)
             }
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/signers/NostrSignerExternal.kt b/quartz/src/main/java/com/vitorpamplona/quartz/signers/NostrSignerExternal.kt
index f65cf4f4c..b051e9ffc 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/signers/NostrSignerExternal.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/signers/NostrSignerExternal.kt
@@ -79,7 +79,7 @@ class NostrSignerExternal(
                         event.kind,
                         event.tags,
                         event.content,
-                        signature,
+                        signature.split("-")[0],
                     ) as? T?
                 )
                     ?.let { onReady(it) }