Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

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

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,
limit = params.requestedLoadSize,
offset = 0,
following =false)
following = false)
.subscribe(
{ data ->
val res = parser(data)
@ -84,10 +84,16 @@ class SearchDataSource<T>(
override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback<T>) {
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<T>(
} else {
parser(data)
}
if(res.isEmpty()) {
if (res.isEmpty()) {
source.exhausted = true
}
callback.onResult(res)