From 4bd19c3e3da08cc99146b9f37cebc7a8152e06ed Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 7 Jun 2023 12:07:03 -0400 Subject: [PATCH] Deletes hiddenUsers method from account to avoid misuse since it needs a blocking load from cache. --- .../main/java/com/vitorpamplona/amethyst/model/Account.kt | 4 ---- .../amethyst/ui/dal/HiddenAccountsFeedFilter.kt | 6 +++++- 2 files changed, 5 insertions(+), 5 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 ea996a3c1..d90f42cc4 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt @@ -89,10 +89,6 @@ class Account( return followingChannels.map { LocalCache.getOrCreateChannel(it) } } - fun hiddenUsers(): List { - return (hiddenUsers + transientHiddenUsers).map { LocalCache.getOrCreateUser(it) } - } - fun isWriteable(): Boolean { return loggedIn.privKey != null } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt index 2ea645109..e63cc809d 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt @@ -1,9 +1,13 @@ package com.vitorpamplona.amethyst.ui.dal import com.vitorpamplona.amethyst.model.Account +import com.vitorpamplona.amethyst.model.LocalCache import com.vitorpamplona.amethyst.model.User class HiddenAccountsFeedFilter(val account: Account) : FeedFilter() { - override fun feed() = account.hiddenUsers() + override fun feed(): List { + return (account.hiddenUsers + account.transientHiddenUsers) + .map { LocalCache.getOrCreateUser(it) } + } }