From 18b2fdb7e46e3ffc0cf62be80fc27e32c4f33d0f Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sat, 6 Sep 2025 10:28:14 -0400 Subject: [PATCH] Removes one of the Application dependencies in viewmodel --- .../amethyst/ui/navigation/drawer/DrawerContent.kt | 4 +++- .../amethyst/ui/screen/loggedIn/AccountViewModel.kt | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt index 03a1fe521..1d2522ec5 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt @@ -531,7 +531,9 @@ fun ListContent( @Composable private fun RelayStatus(accountViewModel: AccountViewModel) { - val connectedRelaysText by accountViewModel.relayStatusFlow().collectAsStateWithLifecycle() + val connectedRelaysText by accountViewModel.account.client + .relayStatusFlow() + .collectAsStateWithLifecycle() RenderRelayStatus(connectedRelaysText) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt index 90a93c8b7..c8176af67 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt @@ -1600,8 +1600,6 @@ class AccountViewModel( fun findUsersStartingWithSync(prefix: String) = LocalCache.findUsersStartingWith(prefix, account) - fun relayStatusFlow() = app.client.relayStatusFlow() - fun convertAccounts(loggedInAccounts: List?): Set = loggedInAccounts ?.mapNotNull {