laantungir/Amber
1
0
Fork 0
mirror of https://github.com/greenart7c3/Amber.git synced 2026-10-05 19:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use NostrConnectEvent.KIND instead of 24133

Browse Source
This commit is contained in:
greenart7c3
2025-06-25 16:27:12 -03:00
parent 497a483ed0
commit c970ec7726
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt
+2 -1
View File
@@ -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<Event>(
TimeUtils.now(),
24133,
NostrConnectEvent.KIND,
arrayOf(arrayOf("p", localKey)),
encryptedContent,
) {
app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt
+2 -1
View File
@@ -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
}
app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationDataSource.kt
+2 -1
View File
@@ -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,
app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/EditRelaysDialog.kt
+4 -3
View File
@@ -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<Event>(
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)),
),
),