From fb7610cafd6229f283558221b899cf6342c34512 Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 29 Oct 2025 14:38:54 -0300 Subject: [PATCH 1/2] Fix DecryptZapRequest CommandType --- .../api/foreground/intents/requests/DecryptZapRequest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/requests/DecryptZapRequest.kt b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/requests/DecryptZapRequest.kt index 80ee7602b..526524f3a 100644 --- a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/requests/DecryptZapRequest.kt +++ b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/requests/DecryptZapRequest.kt @@ -35,7 +35,7 @@ class DecryptZapRequest { ): Intent { val intent = Intent(Intent.ACTION_VIEW, "nostrsigner:${event.toJson()}".toUri()) intent.`package` = packageName - intent.putExtra("type", CommandType.NIP44_DECRYPT.code) + intent.putExtra("type", CommandType.DECRYPT_ZAP_EVENT.code) intent.putExtra("current_user", loggedInUser) return intent } From 3a744b9c1d55a732cd9573a9a25335a2b4f26736 Mon Sep 17 00:00:00 2001 From: davotoula Date: Wed, 29 Oct 2025 20:23:46 +0100 Subject: [PATCH 2/2] only check follow sets when user1 is the logged-in user --- .../service/relayClient/reqCommand/user/UserObservers.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt index fb7a6764f..7b5932a5f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt @@ -413,7 +413,12 @@ fun observeUserIsFollowing( UserFinderFilterAssemblerSubscription(user1, accountViewModel) val isUserInFollowSets = remember(accountViewModel.account.followSetsState) { - accountViewModel.account.followSetsState.isUserInFollowSets(user2) + // Only check follow sets if user1 is the logged-in user + if (user1 == accountViewModel.account.userProfile()) { + accountViewModel.account.followSetsState.isUserInFollowSets(user2) + } else { + false + } } // Subscribe in the LocalCache for changes that arrive in the device