From a796a8adcf44e9574c15ebdc07dc5f216ee5d58e Mon Sep 17 00:00:00 2001
From: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Date: Wed, 15 Jan 2025 12:32:50 +0530
Subject: [PATCH 1/2] category: fix category search in explore

This is a change that replicates the fix done via PR #6093.
This is based over v5.1.1 as the fix seems necessary for
the category search to work properly on the explore screen.
---
 .../main/java/fr/free/nrw/commons/category/CategoryClient.kt    | 2 +-
 .../java/fr/free/nrw/commons/wikidata/mwapi/MwQueryPage.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt
index 992c4ed1c..64463d826 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt
@@ -124,7 +124,7 @@ class CategoryClient
                 }.map {
                     it
                         .filter { page ->
-                            !page.categoryInfo().isHidden
+                            page.categoryInfo() == null || !page.categoryInfo().isHidden
                         }.map {
                             CategoryItem(
                                 it.title().replace(CATEGORY_PREFIX, ""),
diff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/mwapi/MwQueryPage.java b/app/src/main/java/fr/free/nrw/commons/wikidata/mwapi/MwQueryPage.java
index be886b205..d6023ce51 100644
--- a/app/src/main/java/fr/free/nrw/commons/wikidata/mwapi/MwQueryPage.java
+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/mwapi/MwQueryPage.java
@@ -36,7 +36,7 @@ public class MwQueryPage extends BaseModel {
         return title;
     }
 
-    @NonNull public CategoryInfo categoryInfo() {
+    public CategoryInfo categoryInfo() {
         return categoryinfo;
     }
 

From be0b1db193ff0df8e74c6abe710e9ae2978dbb2f Mon Sep 17 00:00:00 2001
From: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Date: Wed, 15 Jan 2025 12:50:53 +0530
Subject: [PATCH 2/2] Version v5.1.2

---
 CHANGELOG.md     | 6 ++++++
 app/build.gradle | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43e2e249a..e7accf82b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Wikimedia Commons for Android
 
+## v5.1.2
+
+### What's changed
+
+* Fix the broken category search in the explore screen
+
 ## v5.1.1
 
 ### What's changed
diff --git a/app/build.gradle b/app/build.gradle
index 888bbec80..b5445f7d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -207,8 +207,8 @@ android {
     defaultConfig {
         //applicationId 'fr.free.nrw.commons'
 
-        versionCode 1042
-        versionName '5.1.1'
+        versionCode 1043
+        versionName '5.1.2'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion 21