Check for empty relays, always use the application relays and not the…

… default relays
greenart7c3 · Jan 24, 2025 · a7d9bd8 · a7d9bd8
1 parent ed41aa2
commit a7d9bd8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 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
@@ -61,6 +61,26 @@ object BunkerRequestUtils {
         onLoading: (Boolean) -> Unit,
         onDone: (Boolean) -> Unit,
     ) {
+        if (relays.isEmpty()) {
+            onDone(true)
+            onLoading(false)
+            NostrSigner.getInstance().applicationIOScope.launch {
+                relays.forEach { relay ->
+                    NostrSigner.getInstance().getDatabase(account.signer.keyPair.pubKey.toNpub()).applicationDao().insertLog(
+                        LogEntity(
+                            id = 0,
+                            url = relay.url,
+                            type = "bunker response",
+                            message = "No relays specified for the bunker response",
+                            time = System.currentTimeMillis(),
+                        ),
+                    )
+                }
+            }
+
+            return
+        }
+
         AmberListenerSingleton.getListener()?.let {
             NostrSigner.getInstance().client.unsubscribe(it)
         }

diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt
@@ -241,7 +241,7 @@ class EventNotificationConsumer(private val applicationContext: Context) {
                         acc,
                         bunkerRequest,
                         BunkerResponse(bunkerRequest.id, "", message),
-                        applicationWithSecret?.application?.relays ?: NostrSigner.getInstance().getSavedRelays().toList(),
+                        applicationWithSecret?.application?.relays ?: emptyList(),
                         onLoading = { },
                         onDone = {
                             if (!it) {
@@ -250,7 +250,7 @@ class EventNotificationConsumer(private val applicationContext: Context) {
                                     acc,
                                     bunkerRequest,
                                     BunkerResponse(bunkerRequest.id, "", message),
-                                    applicationWithSecret?.application?.relays ?: NostrSigner.getInstance().getSavedRelays().toList(),
+                                    applicationWithSecret?.application?.relays ?: emptyList(),
                                     onLoading = { },
                                     onDone = { },
                                 )
@@ -294,7 +294,7 @@ class EventNotificationConsumer(private val applicationContext: Context) {
         if (type == SignerType.CONNECT) {
             message = "$name ${bunkerPermission.toLocalizedString(applicationContext)}"
         }
-        val relays = permission?.application?.relays ?: applicationWithSecret?.application?.relays ?: NostrSigner.getInstance().getSavedRelays().toList()
+        val relays = permission?.application?.relays ?: applicationWithSecret?.application?.relays ?: emptyList()
 
         if (type == SignerType.INVALID) {
             Log.d("EventNotificationConsumer", "Invalid request method ${bunkerRequest.method}")