Merge pull request #532 from squanchy-dev/fix_search_crashing

Fix search crashing — hotfix

Author: quiro91

app/src/main/java/net/squanchy/search/SearchActivity.kt

@@ -72,7 +72,8 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
         searchTextWatcher = SearchTextWatcher(querySubject)
         searchField.addTextChangedListener(searchTextWatcher)
 
-        val searchSubscription = querySubject.throttleLast(QUERY_DEBOUNCE_TIMEOUT, TimeUnit.MILLISECONDS)
+        val searchSubscription = querySubject.distinctUntilChanged()
+            .debounce(QUERY_DEBOUNCE_TIMEOUT, TimeUnit.MILLISECONDS)
             .doOnNext(::updateSearchActionIcon)
             .startWith(getInitialQuery())
             .flatMap(searchService::find)

app/src/main/java/net/squanchy/search/SearchService.kt

@@ -3,16 +3,16 @@ package net.squanchy.search
 import io.reactivex.Observable
 import io.reactivex.functions.Function3
 import net.squanchy.schedule.domain.view.Event
+import net.squanchy.search.SearchListElement.AlgoliaLogo
+import net.squanchy.search.SearchListElement.EventElement
+import net.squanchy.search.SearchListElement.EventHeader
+import net.squanchy.search.SearchListElement.SpeakerElement
+import net.squanchy.search.SearchListElement.SpeakerHeader
 import net.squanchy.search.algolia.AlgoliaSearchEngine
 import net.squanchy.search.algolia.model.AlgoliaSearchResult
-import net.squanchy.search.algolia.model.AlgoliaSearchResult.QueryNotLongEnough
 import net.squanchy.search.algolia.model.AlgoliaSearchResult.ErrorSearching
 import net.squanchy.search.algolia.model.AlgoliaSearchResult.Matches
-import net.squanchy.search.SearchListElement.SpeakerHeader
-import net.squanchy.search.SearchListElement.EventHeader
-import net.squanchy.search.SearchListElement.SpeakerElement
-import net.squanchy.search.SearchListElement.AlgoliaLogo
-import net.squanchy.search.SearchListElement.EventElement
+import net.squanchy.search.algolia.model.AlgoliaSearchResult.QueryNotLongEnough
 import net.squanchy.service.repository.AuthService
 import net.squanchy.service.repository.EventRepository
 import net.squanchy.service.repository.SpeakerRepository

app/src/main/java/net/squanchy/search/view/SearchRecyclerView.kt

@@ -12,6 +12,7 @@ import net.squanchy.schedule.domain.view.Event
 import net.squanchy.search.SearchResult
 import net.squanchy.speaker.domain.view.Speaker
 import net.squanchy.support.unwrapToActivityContext
+import net.squanchy.support.view.setAdapterIfNone
 import net.squanchy.support.widget.CardLayout
 
 class SearchRecyclerView @JvmOverloads constructor(
@@ -33,20 +34,16 @@ class SearchRecyclerView @JvmOverloads constructor(
         addItemDecoration(CardOnlySpacingItemDecorator(horizontalSpacing, verticalSpacing))
 
         adapter = SearchAdapter(context.unwrapToActivityContext())
-        setAdapter(adapter)
         clipToPadding = false
     }
 
     fun updateWith(searchResult: SearchResult.Success, listener: OnSearchResultClickListener) {
-        if (getAdapter() == null) {
-            super.setAdapter(adapter)
-        }
+        setAdapterIfNone(adapter)
 
         adapter.updateWith(searchResult, listener)
 
-        val layoutManager = layoutManager as GridLayoutManager
         val spanSizeLookup = adapter.createSpanSizeLookup(COLUMNS_COUNT)
-        layoutManager.spanSizeLookup = spanSizeLookup
+        (layoutManager as GridLayoutManager).spanSizeLookup = spanSizeLookup
     }
 
     interface OnSearchResultClickListener {