From bfbfcb6ed27e4a997aaa2675cee785c3ba0c1ee8 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Tue, 19 Mar 2024 19:29:50 -0400 Subject: [PATCH] Avoids triggering an error when decoding invalid hexes. --- .../vitorpamplona/amethyst/model/Account.kt | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 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 ffcfd11db..4905e5e6f 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt @@ -237,8 +237,10 @@ class Account( private val liveHomeList: StateFlow by lazy { defaultHomeFollowList .transformLatest { - LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let { - emit(it) + if (it != GLOBAL_FOLLOWS && it != KIND3_FOLLOWS) { + LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let { + emit(it) + } } } .flattenMerge() @@ -272,8 +274,10 @@ class Account( private val liveNotificationList: StateFlow by lazy { defaultNotificationFollowList .transformLatest { - LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let { - emit(it) + if (it != GLOBAL_FOLLOWS && it != KIND3_FOLLOWS) { + LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let { + emit(it) + } } } .flattenMerge() @@ -307,8 +311,10 @@ class Account( private val liveStoriesList: StateFlow by lazy { defaultStoriesFollowList .transformLatest { - LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let { - emit(it) + if (it != GLOBAL_FOLLOWS && it != KIND3_FOLLOWS) { + LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let { + emit(it) + } } } .flattenMerge() @@ -342,8 +348,10 @@ class Account( private val liveDiscoveryList: StateFlow by lazy { defaultDiscoveryFollowList .transformLatest { - LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let { - emit(it) + if (it != GLOBAL_FOLLOWS && it != KIND3_FOLLOWS) { + LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let { + emit(it) + } } } .flattenMerge()