From 30e33d59e885195bbc67530c937371cfca41bef0 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Tue, 22 Jul 2025 16:03:37 +0200
Subject: [PATCH] Use correct fix for nextPage being null while creating error
 report in SearchFragment.handleNextItems()

---
 .../newpipe/fragments/list/search/SearchFragment.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 fc95312ea..6916ca826 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
@@ -1089,8 +1089,9 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     public void handleNextItems(final ListExtractor.InfoItemsPage<?> result) {
         showListFooter(false);
         infoListAdapter.addInfoItemList(result.getItems());
-        nextPage = result.getNextPage();
 
+        // 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() + ", "
@@ -1098,6 +1099,10 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                             + "pageCookies: " + nextPage.getCookies(),
                     serviceId));
         }
+
+        // keep the reassignment of nextPage after the error handling to ensure that nextPage
+        // still holds the correct value during the error handling
+        nextPage = result.getNextPage();
         super.handleNextItems(result);
     }