Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'nextKey_fix' into 'master' 

Make sure not to send twice the same key for subsequent pages

Closes #293

See merge request pixeldroid/PixelDroid!361
This commit is contained in:
Matthieu 2021-06-18 07:10:58 +00:00
parent 56bc1a11c4 68222c2662
commit 120118bfc0
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/accountLists/FollowersPagingSource.kt
View File

@ -56,7 +56,7 @@ class FollowersPagingSource(
LoadResult.Page( LoadResult.Page(
data = accounts, data = accounts,
prevKey = null, prevKey = null,
nextKey = if (accounts.isEmpty() or nextPosition.isEmpty()) null else nextPosition nextKey = if (accounts.isEmpty() || nextPosition.isEmpty() || nextPosition == position) null else nextPosition
) )
} catch (exception: IOException) { } catch (exception: IOException) {
LoadResult.Error(exception) LoadResult.Error(exception)

4
app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/hashtags/HashTagPagingSource.kt
View File

@ -25,10 +25,12 @@ class HashTagPagingSource(
max_id = position, max_id = position,
) )
val nextKey = response.lastOrNull()?.id
LoadResult.Page( LoadResult.Page(
data = response, data = response,
prevKey = null, prevKey = null,
nextKey = response.lastOrNull()?.id nextKey = if(nextKey == position) null else nextKey
) )
} catch (exception: HttpException) { } catch (exception: HttpException) {
LoadResult.Error(exception) LoadResult.Error(exception)

4
app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/profile/ProfilePagingSource.kt
View File

@ -20,10 +20,12 @@ class ProfilePagingSource(
limit = params.loadSize limit = params.loadSize
) )
val nextKey = posts.lastOrNull()?.id
LoadResult.Page( LoadResult.Page(
data = posts, data = posts,
prevKey = null, prevKey = null,
nextKey = posts.lastOrNull()?.id nextKey = if(nextKey == position) null else nextKey
) )
} catch (exception: HttpException) { } catch (exception: HttpException) {
LoadResult.Error(exception) LoadResult.Error(exception)

4
app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt
View File

@ -34,10 +34,12 @@ class SearchPagingSource<T: FeedContent>(
Results.SearchType.statuses -> response.statuses Results.SearchType.statuses -> response.statuses
} as List<T> } as List<T>
val nextKey = if (repos.isEmpty()) null else (position ?: 0) + repos.size
LoadResult.Page( LoadResult.Page(
data = repos, data = repos,
prevKey = null, prevKey = null,
nextKey = if (repos.isEmpty()) null else (position ?: 0) + repos.size nextKey = if(nextKey == position) null else nextKey
) )
} catch (exception: HttpException) { } catch (exception: HttpException) {
LoadResult.Error(exception) LoadResult.Error(exception)