From 92a39c43054e5ed53469367fba6b8c74e4b3b4ae Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 27 Oct 2023 13:58:26 -0400
Subject: [PATCH] Brings notifications back

---
 .../main/java/com/vitorpamplona/amethyst/model/Account.kt   | 6 +++++-
 .../amethyst/service/notifications/RegisterAccounts.kt      | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
index 2d71ed1be..29b5cee1b 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -2142,9 +2142,13 @@ class Account(
     }
 
     fun createAuthEvent(relay: Relay, challenge: String): RelayAuthEvent? {
+        return createAuthEvent(relay.url, challenge)
+    }
+
+    fun createAuthEvent(relayUrl: String, challenge: String): RelayAuthEvent? {
         if (!isWriteable() && !loginWithExternalSigner) return null
 
-        var event = RelayAuthEvent.create(relay.url, challenge, keyPair.pubKey.toHexKey(), keyPair.privKey)
+        var event = RelayAuthEvent.create(relayUrl, challenge, keyPair.pubKey.toHexKey(), keyPair.privKey)
         if (loginWithExternalSigner) {
             ExternalSignerUtils.openSigner(event)
             val eventContent = ExternalSignerUtils.content[event.id] ?: ""
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt
index d0394692c..a080eb797 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt
@@ -28,7 +28,10 @@ class RegisterAccounts(
                 if (acc.loginWithExternalSigner) {
                     ExternalSignerUtils.account = acc
                 }
-                val relayToUse = acc.activeRelays()?.firstOrNull { it.read }
+
+                val readRelays = acc.userProfile().latestContactList?.relays() ?: acc.backupContactList?.relays()
+
+                val relayToUse = readRelays?.firstNotNullOfOrNull { if (it.value.read) it.key else null }
                 if (relayToUse != null) {
                     acc.createAuthEvent(relayToUse, notificationToken)
                 } else {