Merge pull request #20027 from wordpress-mobile/andy/issue-20026

[Bug] Move a small bug fix to a more appropriate place.
wordpress-mobile · Feb 19, 2024 · c9602d9 · c9602d9
2 parents 7f03846 + 5984102
commit c9602d9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/DeviceListBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/DeviceListBuilder.kt
@@ -69,7 +69,7 @@ class DeviceListBuilder(
             // This item sets the threshold for the visible items in all the list
             val lastShownTimestamp = results.fold(0L) { timestamp, (_, result) ->
                 val nextTimestamp = result?.nextTimestamp
-                if (result?.items?.isNotEmpty() == true && nextTimestamp != null && nextTimestamp > timestamp) {
+                if (nextTimestamp != null && nextTimestamp > timestamp) {
                     nextTimestamp
                 } else {
                     timestamp
@@ -118,7 +118,7 @@ class DeviceListBuilder(
                 null
             }
         }
-        addPage(mediaType, result, deviceMediaList.next)
+        addPage(mediaType, result, if (result.isEmpty()) null else deviceMediaList.next)
         return cache[mediaType]
     }