diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/adapter/SearchDataSource.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/adapter/SearchDataSource.kt index f02038db..f170f35e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/search/adapter/SearchDataSource.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/search/adapter/SearchDataSource.kt @@ -62,7 +62,7 @@ class SearchDataSource( resolve = true, limit = params.requestedLoadSize, offset = 0, - following =false) + following = false) .subscribe( { data -> val res = parser(data) @@ -84,10 +84,16 @@ class SearchDataSource( override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback) { networkState.postValue(NetworkState.LOADING) retry = null - if(source.exhausted) { + if (source.exhausted) { return callback.onResult(emptyList()) } - mastodonApi.searchObservable(searchType.apiParameter, searchRequest, true, params.loadSize, params.startPosition, false) + mastodonApi.searchObservable( + query = searchRequest, + type = searchType.apiParameter, + resolve = true, + limit = params.loadSize, + offset = params.startPosition, + following = false) .subscribe( { data -> // Working around Mastodon bug where exact match is returned no matter @@ -101,7 +107,7 @@ class SearchDataSource( } else { parser(data) } - if(res.isEmpty()) { + if (res.isEmpty()) { source.exhausted = true } callback.onResult(res)