Skip to content

Commit 48b3002

Browse files
committed
#3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages
1 parent 310c29c commit 48b3002

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt

+8-5
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,14 @@ class MediaClient @Inject constructor(
138138
}
139139

140140
private fun mediaFromPageAndEntity(pages: List<MwQueryPage>): Single<List<Media>> {
141-
return getEntities(pages.map { "$PAGE_ID_PREFIX${it.pageId()}" })
142-
.map {
143-
pages.zip(it.entities().values)
144-
.map { (page, entity) -> mediaConverter.convert(page, entity) }
145-
}
141+
return if (pages.isEmpty())
142+
Single.just(emptyList())
143+
else
144+
getEntities(pages.map { "$PAGE_ID_PREFIX${it.pageId()}" })
145+
.map {
146+
pages.zip(it.entities().values)
147+
.map { (page, entity) -> mediaConverter.convert(page, entity) }
148+
}
146149
}
147150

148151
/**

0 commit comments

Comments
 (0)