From c0fe13d79ca00e0945352a6b335d252b62101d6a Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Tue, 14 Feb 2023 17:42:35 -0500 Subject: [PATCH] Only wait 5 seconds to update lists if contents are already been displayed. --- .../com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt | 3 ++- .../java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt | 3 ++- .../com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt index be5806a63..a1cacac3d 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt @@ -125,7 +125,8 @@ class CardFeedViewModel(val dataSource: NostrDataSource): ViewModel() { handlerWaiting.set(true) val scope = CoroutineScope(Job() + Dispatchers.Default) scope.launch { - delay(5000) + if (feedContent.value is CardFeedState.Loaded) + delay(5000) refresh() handlerWaiting.set(false) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt index bd38caf22..a750ab2f4 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt @@ -122,7 +122,8 @@ abstract class FeedViewModel(val dataSource: NostrDataSource): ViewModel() handlerWaiting.set(true) val scope = CoroutineScope(Job() + Dispatchers.Default) scope.launch { - delay(5000) + if (feedContent.value is FeedState.Loaded) + delay(5000) refresh() handlerWaiting.set(false) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt index 8611bf244..d417734f4 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt @@ -87,7 +87,8 @@ open class UserFeedViewModel(val dataSource: NostrDataSource): ViewModel() handlerWaiting.set(true) val scope = CoroutineScope(Job() + Dispatchers.Default) scope.launch { - delay(5000) + if (feedContent.value is UserFeedState.Loaded) + delay(5000) refresh() handlerWaiting.set(false) }