From d61b59a7ed78d53e81915d1333d9de78ca0c078c Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Sun, 27 Oct 2024 15:22:12 -0300
Subject: [PATCH] Fix private zaps

---
 .../greenart7c3/nostrsigner/SignerProvider.kt | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt
index 6dd05a9f..658c8e08 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt
@@ -12,7 +12,6 @@ import com.greenart7c3.nostrsigner.models.TimeUtils
 import com.greenart7c3.nostrsigner.models.kindToNip
 import com.greenart7c3.nostrsigner.service.AmberUtils
 import com.greenart7c3.nostrsigner.service.IntentUtils
-import com.greenart7c3.nostrsigner.service.model.AmberEvent
 import com.vitorpamplona.quartz.crypto.CryptoUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.encoders.toNpub
@@ -112,27 +111,12 @@ class SignerProvider : ContentProvider() {
                 if (!LocalPreferences.containsAccount(context!!, npub)) return null
                 val account = LocalPreferences.loadFromEncryptedStorage(context!!, npub) ?: return null
                 val event = try {
-                    AmberEvent.toEvent(AmberEvent.fromJson(json))
+                    IntentUtils.getUnsignedEvent(json, account)
                 } catch (e: Exception) {
                     Log.d("SignerProvider", "Failed to parse event from $packageName", e)
                     return null
                 }
 
-                if (event.pubKey.isBlank()) {
-                    Log.d("SignerProvider", "Event from $packageName has no pubkey")
-                    return null
-                }
-
-                if (event.pubKey != account.keyPair.pubKey.toHexKey()) {
-                    Log.d("SignerProvider", "Event from $packageName has incorrect pubkey")
-                    return null
-                }
-
-                if (!event.hasCorrectIDHash()) {
-                    Log.d("SignerProvider", "Event from $packageName has incorrect ID hash")
-                    return null
-                }
-
                 val database = NostrSigner.getInstance().getDatabase(account.keyPair.pubKey.toNpub())
                 var permission =
                     database
@@ -211,7 +195,7 @@ class SignerProvider : ContentProvider() {
                 val cursor =
                     MatrixCursor(arrayOf("signature", "event", "result")).also {
                         val signature =
-                            if (event is LnZapRequestEvent &&
+                            if (event.kind == LnZapRequestEvent.KIND &&
                                 event.tags.any {
                                         tag ->
                                     tag.any { t -> t == "anon" }