highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-11-10 22:36:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Vitor Pamplona
2025-10-29 15:57:48 -04:00
parent 56a856cf71 904b8c445f
commit 40ce627de0
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt
View File

@@ -413,7 +413,12 @@ fun observeUserIsFollowing(
UserFinderFilterAssemblerSubscription(user1, accountViewModel) UserFinderFilterAssemblerSubscription(user1, accountViewModel)
val isUserInFollowSets = val isUserInFollowSets =
remember(accountViewModel.account.followSetsState) { remember(accountViewModel.account.followSetsState) {
// Only check follow sets if user1 is the logged-in user
if (user1 == accountViewModel.account.userProfile()) {
accountViewModel.account.followSetsState.isUserInFollowSets(user2) accountViewModel.account.followSetsState.isUserInFollowSets(user2)
} else {
false
}
} }
// Subscribe in the LocalCache for changes that arrive in the device // Subscribe in the LocalCache for changes that arrive in the device

2
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/requests/DecryptZapRequest.kt
View File

@@ -35,7 +35,7 @@ class DecryptZapRequest {
): Intent { ): Intent {
val intent = Intent(Intent.ACTION_VIEW, "nostrsigner:${event.toJson()}".toUri()) val intent = Intent(Intent.ACTION_VIEW, "nostrsigner:${event.toJson()}".toUri())
intent.`package` = packageName intent.`package` = packageName
intent.putExtra("type", CommandType.NIP44_DECRYPT.code) intent.putExtra("type", CommandType.DECRYPT_ZAP_EVENT.code)
intent.putExtra("current_user", loggedInUser) intent.putExtra("current_user", loggedInUser)
return intent return intent
} }