From 97717df28a03c9c528859882b73fd1d3e6e53d1f Mon Sep 17 00:00:00 2001
From: Badr Kouki <badreddinekouki1998@gmail.com>
Date: Sat, 5 Jul 2025 11:33:11 +0100
Subject: [PATCH 1/3] fix: handle nullable nextPage behavior when searching
 albums #12401

---
 .../schabi/newpipe/fragments/list/search/SearchFragment.java    | 2 +-
 1 file changed, 1 insertion(+), 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 fa166909320..68ad9bfb7cd 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,7 +1090,7 @@ public void handleNextItems(final ListExtractor.InfoItemsPage<?> result) {
         infoListAdapter.addInfoItemList(result.getItems());
         nextPage = result.getNextPage();
 
-        if (!result.getErrors().isEmpty()) {
+        if (!result.getErrors().isEmpty() && nextPage != null) {
             showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.SEARCHED,
                     "\"" + searchString + "\" → pageUrl: " + nextPage.getUrl() + ", "
                             + "pageIds: " + nextPage.getIds() + ", "

From 5906f0e5b9b96c49eadf913a2b939fd057605039 Mon Sep 17 00:00:00 2001
From: Badr Kouki <badreddinekouki1998@gmail.com>
Date: Mon, 7 Jul 2025 21:51:09 +0100
Subject: [PATCH 2/3] feat: add nullable annotation to newPage attribute in
 SearchFragment

---
 .../org/schabi/newpipe/fragments/list/search/SearchFragment.java | 1 +
 1 file changed, 1 insertion(+)

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 68ad9bfb7cd..fc95312ea5a 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
@@ -144,6 +144,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
 
     private final SparseArrayCompat<String> menuItemToFilterName = new SparseArrayCompat<>();
     private StreamingService service;
+    @Nullable
     private Page nextPage;
     private boolean showLocalSuggestions = true;
     private boolean showRemoteSuggestions = true;

From 799298a7ecb184a36a9a208b0fe6e67f53aad328 Mon Sep 17 00:00:00 2001
From: Siddhesh Naik <siddheshnaik20@protonmail.com>
Date: Sun, 20 Jul 2025 00:17:16 +0530
Subject: [PATCH 3/3] Updated more usages of InfoItemsPage#getNextPage.
 Nullability is already handled in these areas so no other changes needed

---
 .../org/schabi/newpipe/fragments/list/BaseListInfoFragment.java | 2 ++
 .../schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
index 61a361f23ee..7f594734a75 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
@@ -8,6 +8,7 @@
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.evernote.android.state.State;
 
@@ -42,6 +43,7 @@ public abstract class BaseListInfoFragment<I extends InfoItem, L extends ListInf
 
     private final UserAction errorUserAction;
     protected L currentInfo;
+    @Nullable
     protected Page currentNextPage;
     protected Disposable currentWorker;
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
index dbfac5cca1c..02bb6b5ba0f 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
@@ -3,6 +3,7 @@
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
@@ -23,6 +24,7 @@ abstract class AbstractInfoPlayQueue<T extends ListInfo<? extends InfoItem>>
 
     final int serviceId;
     final String baseUrl;
+    @Nullable
     Page nextPage;
 
     private transient Disposable fetchReactor;