mir/newpipe
2
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-08-22 01:58:16 +00:00
Code Issues Releases Wiki Activity

Improve null checking further in SearchFragment.handleNextItems

Browse Source
This commit is contained in:
Stypox 2025-07-28 14:43:46 +02:00
parent 30e33d59e8
commit 9ba30887f9
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
View File

@ -1090,15 +1090,20 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
showListFooter(false); showListFooter(false);
infoListAdapter.addInfoItemList(result.getItems()); infoListAdapter.addInfoItemList(result.getItems());
// nextPage should not be null here because it refers to the page if (!result.getErrors().isEmpty()) {
// which results are handled here, but we check it anyway // nextPage should be non-null at this point, because it refers to the page
if (!result.getErrors().isEmpty() && nextPage != null) { // 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, showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.SEARCHED,
"\"" + searchString + "\" → pageUrl: " + nextPage.getUrl() + ", " "\"" + searchString + "\" → pageUrl: " + nextPage.getUrl() + ", "
+ "pageIds: " + nextPage.getIds() + ", " + "pageIds: " + nextPage.getIds() + ", "
+ "pageCookies: " + nextPage.getCookies(), + "pageCookies: " + nextPage.getCookies(),
serviceId)); serviceId));
} }
}
// keep the reassignment of nextPage after the error handling to ensure that nextPage // keep the reassignment of nextPage after the error handling to ensure that nextPage
// still holds the correct value during the error handling // still holds the correct value during the error handling