From 48b3002d05af77af4b54a904ac056e830253ad07 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Wed, 17 Jun 2020 10:46:04 +0100
Subject: [PATCH] #3810 Convert DepictedImagesFragment to use Pagination - map
 to empty result with no pages

---
 .../java/fr/free/nrw/commons/media/MediaClient.kt   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt
index 5dd69b9bb..cd5d963bb 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt
@@ -138,11 +138,14 @@ class MediaClient @Inject constructor(
     }
 
     private fun mediaFromPageAndEntity(pages: List<MwQueryPage>): Single<List<Media>> {
-        return getEntities(pages.map { "$PAGE_ID_PREFIX${it.pageId()}" })
-            .map {
-                pages.zip(it.entities().values)
-                    .map { (page, entity) -> mediaConverter.convert(page, entity) }
-            }
+        return if (pages.isEmpty())
+            Single.just(emptyList())
+        else
+            getEntities(pages.map { "$PAGE_ID_PREFIX${it.pageId()}" })
+                .map {
+                    pages.zip(it.entities().values)
+                        .map { (page, entity) -> mediaConverter.convert(page, entity) }
+                }
     }
 
     /**