Skip to content

Commit c9602d9

Browse files
authored
Merge pull request #20027 from wordpress-mobile/andy/issue-20026
[Bug] Move a small bug fix to a more appropriate place.
2 parents 7f03846 + 5984102 commit c9602d9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/DeviceListBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class DeviceListBuilder(
6969
// This item sets the threshold for the visible items in all the list
7070
val lastShownTimestamp = results.fold(0L) { timestamp, (_, result) ->
7171
val nextTimestamp = result?.nextTimestamp
72-
if (result?.items?.isNotEmpty() == true && nextTimestamp != null && nextTimestamp > timestamp) {
72+
if (nextTimestamp != null && nextTimestamp > timestamp) {
7373
nextTimestamp
7474
} else {
7575
timestamp
@@ -118,7 +118,7 @@ class DeviceListBuilder(
118118
null
119119
}
120120
}
121-
addPage(mediaType, result, deviceMediaList.next)
121+
addPage(mediaType, result, if (result.isEmpty()) null else deviceMediaList.next)
122122
return cache[mediaType]
123123
}
124124

0 commit comments

Comments
 (0)