Remove debounce and switch to rxSingle

Automattic · Jul 28, 2023 · 0bd594e · 0bd594e
1 parent 3650186
commit 0bd594e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 17 deletions.
diff --git a/.../main/java/au/com/shiftyjelly/pocketcasts/podcasts/helper/search/BookmarkSearchHandler.kt b/.../main/java/au/com/shiftyjelly/pocketcasts/podcasts/helper/search/BookmarkSearchHandler.kt
@@ -3,31 +3,23 @@ package au.com.shiftyjelly.pocketcasts.podcasts.helper.search
 import au.com.shiftyjelly.pocketcasts.models.entity.Bookmark
 import au.com.shiftyjelly.pocketcasts.repositories.bookmark.BookmarkManager
 import io.reactivex.Observable
-import io.reactivex.Single
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.rx2.rxSingle
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class BookmarkSearchHandler @Inject constructor(
     private val bookmarkManager: BookmarkManager,
 ) : SearchHandler<Bookmark>() {
-    override val searchDebounce = 500L
 
     override fun getSearchResultsObservable(podcastUuid: String): Observable<SearchResult> =
-        searchQueryRelay.debounce { // Only debounce when search has a value otherwise it slows down loading the pages
-            if (it.isEmpty()) {
-                Observable.empty()
-            } else {
-                Observable.timer(searchDebounce, TimeUnit.MILLISECONDS)
-            }
-        }.switchMapSingle { searchTerm ->
+        searchQueryRelay.switchMapSingle { searchTerm ->
             if (searchTerm.length > 1) {
-                Single.just(bookmarkManager.searchInPodcastByTitle(podcastUuid, searchTerm))
+                rxSingle { bookmarkManager.searchInPodcastByTitle(podcastUuid, searchTerm) }
                     .map { SearchResult(searchTerm, it) }
                     .onErrorReturnItem(noSearchResult)
             } else {
-                Single.just(noSearchResult)
+                rxSingle { noSearchResult }
             }
         }.distinctUntilChanged()
 

diff --git a/...c/main/java/au/com/shiftyjelly/pocketcasts/podcasts/helper/search/EpisodeSearchHandler.kt b/...c/main/java/au/com/shiftyjelly/pocketcasts/podcasts/helper/search/EpisodeSearchHandler.kt
@@ -17,7 +17,7 @@ class EpisodeSearchHandler @Inject constructor(
     private val cacheServerManager: PodcastCacheServerManagerImpl,
     private val analyticsTracker: AnalyticsTrackerWrapper,
 ) : SearchHandler<BaseEpisode>() {
-    override val searchDebounce = settings.getEpisodeSearchDebounceMs()
+    private val searchDebounce = settings.getEpisodeSearchDebounceMs()
 
     override fun getSearchResultsObservable(podcastUuid: String): Observable<SearchResult> =
         searchQueryRelay.debounce { // Only debounce when search has a value otherwise it slows down loading the pages

diff --git a/...asts/src/main/java/au/com/shiftyjelly/pocketcasts/podcasts/helper/search/SearchHandler.kt b/...asts/src/main/java/au/com/shiftyjelly/pocketcasts/podcasts/helper/search/SearchHandler.kt
@@ -5,7 +5,6 @@ import io.reactivex.Observable
 
 abstract class SearchHandler<T> {
     private var searchTerm = ""
-    abstract val searchDebounce: Long
     protected val searchQueryRelay = BehaviorRelay.create<String>()
         .apply { accept("") }
 

diff --git a/.../services/model/src/main/java/au/com/shiftyjelly/pocketcasts/models/db/dao/BookmarkDao.kt b/.../services/model/src/main/java/au/com/shiftyjelly/pocketcasts/models/db/dao/BookmarkDao.kt
@@ -71,7 +71,7 @@ abstract class BookmarkDao {
             AND (UPPER(bookmarks.title) LIKE UPPER(:title) OR UPPER(podcast_episodes.title) LIKE UPPER(:title))
             AND deleted = :deleted"""
     )
-    abstract fun searchInPodcastByTitle(
+    abstract suspend fun searchInPodcastByTitle(
         podcastUuid: String,
         title: String,
         deleted: Boolean = false,

diff --git a/...ies/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/bookmark/BookmarkManager.kt b/...ies/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/bookmark/BookmarkManager.kt
@@ -19,5 +19,5 @@ interface BookmarkManager {
     suspend fun deleteSynced(bookmarkUuid: String)
     suspend fun upsertSynced(bookmark: Bookmark): Bookmark
     fun findBookmarksToSync(): List<Bookmark>
-    fun searchInPodcastByTitle(podcastUuid: String, title: String): List<String>
+    suspend fun searchInPodcastByTitle(podcastUuid: String, title: String): List<String>
 }
diff --git a/...src/main/java/au/com/shiftyjelly/pocketcasts/repositories/bookmark/BookmarkManagerImpl.kt b/...src/main/java/au/com/shiftyjelly/pocketcasts/repositories/bookmark/BookmarkManagerImpl.kt
@@ -111,7 +111,7 @@ class BookmarkManagerImpl @Inject constructor(
         flowOf(helper.map { it.toBookmark() })
     }
 
-    override fun searchInPodcastByTitle(podcastUuid: String, title: String) =
+    override suspend fun searchInPodcastByTitle(podcastUuid: String, title: String) =
         bookmarkDao.searchInPodcastByTitle(podcastUuid, "%$title%").map { it.uuid }
 
     /**