From 7d96e9468983d3d482c341208b8e0836feca09ff Mon Sep 17 00:00:00 2001
From: Dmitriy <dekanszn@gmail.com>
Date: Thu, 16 Oct 2025 14:56:41 +0400
Subject: [PATCH] Fix crash for bookmarks without descriptions/thumbnails
 (#6488)

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
---
 .../bookmarks/items/BookmarkItemsDao.kt       | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt
index bfb3ec764..e21e1ac8f 100644
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt
+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt
@@ -173,19 +173,13 @@ class BookmarkItemsDao @Inject constructor(
         categoryNameList: List<String>,
         categoryDescriptionList: List<String>,
         categoryThumbnailList: List<String>
-    ): List<CategoryItem> {
-        return buildList {
-            for (i in categoryNameList.indices) {
-                add(
-                    CategoryItem(
-                        categoryNameList[i],
-                        categoryDescriptionList[i],
-                        categoryThumbnailList[i],
-                        false
-                    )
-                )
-            }
-        }
+    ): List<CategoryItem> = categoryNameList.mapIndexed { index, name ->
+        CategoryItem(
+            name = name,
+            description = categoryDescriptionList.getOrNull(index),
+            thumbnail = categoryThumbnailList.getOrNull(index),
+            isSelected = false
+        )
     }
 
     /**