highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-06 18:22:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adds a try/catch when receiving notifications to make sure it gets decrypted by the correct account.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-06-29 15:33:39 -04:00
parent 2230d1467c
commit fa44b74f09
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt
View File

@@ -58,7 +58,11 @@ class EventNotificationConsumer(
LocalPreferences.allSavedAccounts().forEach { LocalPreferences.allSavedAccounts().forEach {
if (it.hasPrivKey || it.loggedInWithExternalSigner) { if (it.hasPrivKey || it.loggedInWithExternalSigner) {
LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)?.let { acc -> LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)?.let { acc ->
try {
consumeIfMatchesAccount(event, acc) consumeIfMatchesAccount(event, acc)
} catch (e: Exception) {
// Not for this account.
}
} }
} }
} }
@@ -71,7 +75,7 @@ class EventNotificationConsumer(
pushWrappedEvent.cachedGift(account.signer) { notificationEvent -> pushWrappedEvent.cachedGift(account.signer) { notificationEvent ->
val consumed = LocalCache.hasConsumed(notificationEvent) val consumed = LocalCache.hasConsumed(notificationEvent)
val verified = LocalCache.justVerify(notificationEvent) val verified = LocalCache.justVerify(notificationEvent)
Log.d("EventNotificationConsumer", "New Notification Arrived for ${account.userProfile().toBestDisplayName()} consumed= $consumed && verified= $verified") Log.d("EventNotificationConsumer", "New Notification ${notificationEvent.kind} ${notificationEvent.id} Arrived for ${account.userProfile().toBestDisplayName()} consumed= $consumed && verified= $verified")
if (!consumed && verified) { if (!consumed && verified) {
Log.d("EventNotificationConsumer", "New Notification was verified") Log.d("EventNotificationConsumer", "New Notification was verified")
unwrapAndConsume(notificationEvent, account) { innerEvent -> unwrapAndConsume(notificationEvent, account) { innerEvent ->