chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

fix mixup of search params in SearchDataSource.loadRange (#1666)

Browse source
This commit is contained in:
Konrad Pozniak 2020-02-07 20:23:36 +01:00 • committed by GitHub
parent c379014d9a
commit fde23f25d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/keylesspalace/tusky/components/search/adapter/SearchDataSource.kt
View file

@ -62,7 +62,7 @@ class SearchDataSource<T>(
resolve = true, resolve = true,
limit = params.requestedLoadSize, limit = params.requestedLoadSize,
offset = 0, offset = 0,
following =false) following = false)
.subscribe( .subscribe(
{ data -> { data ->
val res = parser(data) val res = parser(data)
@ -84,10 +84,16 @@ class SearchDataSource<T>(
override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback<T>) { override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback<T>) {
networkState.postValue(NetworkState.LOADING) networkState.postValue(NetworkState.LOADING)
retry = null retry = null
if(source.exhausted) { if (source.exhausted) {
return callback.onResult(emptyList()) 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( .subscribe(
{ data -> { data ->
// Working around Mastodon bug where exact match is returned no matter // Working around Mastodon bug where exact match is returned no matter
@ -101,7 +107,7 @@ class SearchDataSource<T>(
} else { } else {
parser(data) parser(data)
} }
if(res.isEmpty()) { if (res.isEmpty()) {
source.exhausted = true source.exhausted = true
} }
callback.onResult(res) callback.onResult(res)