From 0633707ec6b6d76fa339462aee8ae8b1312249a0 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 16 Mar 2023 16:33:17 -0400 Subject: [PATCH] Disabling online search after leaving the Search screen --- .../amethyst/service/NostrSearchEventOrUserDataSource.kt | 2 +- .../vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt index 63d601b166..3fae3330aa 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt @@ -18,7 +18,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") { private fun createAnythingWithIDFilter(): List? { val mySearchString = searchString - if (mySearchString == null) { + if (mySearchString.isNullOrBlank()) { return null } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt index a5fb0da6df..45fc58e819 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt @@ -97,10 +97,13 @@ fun SearchScreen( if (event == Lifecycle.Event.ON_RESUME) { println("Global Start") NostrGlobalDataSource.start() + NostrSearchEventOrUserDataSource.start() feedViewModel.refresh() } if (event == Lifecycle.Event.ON_PAUSE) { println("Global Stop") + NostrSearchEventOrUserDataSource.clear() + NostrSearchEventOrUserDataSource.stop() NostrGlobalDataSource.stop() } }