From 9ba30887f9f58f8cd545996a14e0117b815b68fc Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Mon, 28 Jul 2025 14:43:46 +0200
Subject: [PATCH] Improve null checking further in
 SearchFragment.handleNextItems

---
 .../fragments/list/search/SearchFragment.java | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index 6916ca826..cea06b942 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -1090,14 +1090,19 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         showListFooter(false);
         infoListAdapter.addInfoItemList(result.getItems());
 
-        // nextPage should not be null here because it refers to the page
-        // which results are handled here, but we check it anyway
-        if (!result.getErrors().isEmpty() && nextPage != null) {
-            showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.SEARCHED,
-                    "\"" + searchString + "\" → pageUrl: " + nextPage.getUrl() + ", "
-                            + "pageIds: " + nextPage.getIds() + ", "
-                            + "pageCookies: " + nextPage.getCookies(),
-                    serviceId));
+        if (!result.getErrors().isEmpty()) {
+            // nextPage should be non-null at this point, because it refers to the page
+            // whose results are handled here, but let's check it anyway
+            if (nextPage == null) {
+                showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.SEARCHED,
+                        "\"" + searchString + "\" → nextPage == null", serviceId));
+            } else {
+                showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.SEARCHED,
+                        "\"" + searchString + "\" → pageUrl: " + nextPage.getUrl() + ", "
+                                + "pageIds: " + nextPage.getIds() + ", "
+                                + "pageCookies: " + nextPage.getCookies(),
+                        serviceId));
+            }
         }
 
         // keep the reassignment of nextPage after the error handling to ensure that nextPage