From c970ec7726ccc7c72488dc4344c567f19cd44bb7 Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 25 Jun 2025 16:27:12 -0300 Subject: [PATCH] Use NostrConnectEvent.KIND instead of 24133 --- .../greenart7c3/nostrsigner/service/BunkerRequestUtils.kt | 3 ++- .../nostrsigner/service/EventNotificationConsumer.kt | 3 ++- .../nostrsigner/service/NotificationDataSource.kt | 3 ++- .../greenart7c3/nostrsigner/ui/actions/EditRelaysDialog.kt | 7 ++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt index 401eb793..81288f31 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt @@ -23,6 +23,7 @@ import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerRequest import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerRequestConnect import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerResponse +import com.vitorpamplona.quartz.nip46RemoteSigner.NostrConnectEvent import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay @@ -157,7 +158,7 @@ object BunkerRequestUtils { ) { account.signer.sign( TimeUtils.now(), - 24133, + NostrConnectEvent.KIND, arrayOf(arrayOf("p", localKey)), encryptedContent, ) { diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt index 8fd4bc0f..cffe4c02 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt @@ -58,6 +58,7 @@ import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerRequestNip44Decrypt import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerRequestNip44Encrypt import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerRequestSign import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerResponse +import com.vitorpamplona.quartz.nip46RemoteSigner.NostrConnectEvent import com.vitorpamplona.quartz.utils.TimeUtils import java.util.UUID import kotlinx.coroutines.launch @@ -91,7 +92,7 @@ class EventNotificationConsumer(private val applicationContext: Context) { saveLog("notifications disabled") return } - if (event.kind != 24133) { + if (event.kind != NostrConnectEvent.KIND) { saveLog("Not a bunker request") return } diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationDataSource.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationDataSource.kt index 4904569f..f2e8c076 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationDataSource.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationDataSource.kt @@ -36,6 +36,7 @@ import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.relay.RelayState +import com.vitorpamplona.quartz.nip46RemoteSigner.NostrConnectEvent import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -194,7 +195,7 @@ object NotificationDataSource : NostrDataSource(Amber.instance.client) { return TypedFilter( types = COMMON_FEED_TYPES, filter = SincePerRelayFilter( - kinds = listOf(24133), + kinds = listOf(NostrConnectEvent.KIND), tags = mapOf("p" to pubKeys), limit = 1, since = eoses, diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/EditRelaysDialog.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/EditRelaysDialog.kt index dae36146..37ab82f1 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/EditRelaysDialog.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/EditRelaysDialog.kt @@ -69,6 +69,7 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal +import com.vitorpamplona.quartz.nip46RemoteSigner.NostrConnectEvent import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter import com.vitorpamplona.quartz.utils.TimeUtils import java.util.Base64 @@ -316,7 +317,7 @@ fun onAddRelay( encryptedContent?.let { val event = signer.signerSync.sign( TimeUtils.now(), - 24133, + NostrConnectEvent.KIND, arrayOf(arrayOf("p", signer.keyPair.pubKey.toHexKey())), it, ) @@ -350,7 +351,7 @@ fun onAddRelay( val listener2 = BunkerValidationRelayListener( account, onReceiveEvent = { _, _, event -> - if (event.kind == 24133 && event.id == signedEvent.id) { + if (event.kind == NostrConnectEvent.KIND && event.id == signedEvent.id) { filterResult = true } }, @@ -367,7 +368,7 @@ fun onAddRelay( TypedFilter( types = COMMON_FEED_TYPES, filter = SincePerRelayFilter( - kinds = listOf(24133), + kinds = listOf(NostrConnectEvent.KIND), tags = mapOf("p" to listOf(signedEvent.pubKey)), ), ),