Skip to content

Commit 56ab354

Browse files
committed
[YouTube] Fix potential NullPointerException in YoutubeSearchExtractor.getSearchSuggestion
1 parent 9dc1eab commit 56ab354

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import java.io.IOException;
3737
import java.nio.charset.StandardCharsets;
3838
import java.util.List;
39+
import java.util.Objects;
3940

4041
import javax.annotation.Nonnull;
4142
import javax.annotation.Nullable;
@@ -124,18 +125,17 @@ public String getSearchSuggestion() throws ParsingException {
124125
final JsonObject didYouMeanRenderer = itemSectionRenderer.getArray("contents")
125126
.getObject(0)
126127
.getObject("didYouMeanRenderer");
127-
final JsonObject showingResultsForRenderer = itemSectionRenderer.getArray("contents")
128-
.getObject(0)
129-
.getObject("showingResultsForRenderer");
130128

131129
if (!didYouMeanRenderer.isEmpty()) {
132130
return JsonUtils.getString(didYouMeanRenderer,
133131
"correctedQueryEndpoint.searchEndpoint.query");
134-
} else if (showingResultsForRenderer != null) {
135-
return getTextFromObject(showingResultsForRenderer.getObject("correctedQuery"));
136-
} else {
137-
return "";
138132
}
133+
134+
return Objects.requireNonNullElse(
135+
getTextFromObject(itemSectionRenderer.getArray("contents")
136+
.getObject(0)
137+
.getObject("showingResultsForRenderer")
138+
.getObject("correctedQuery")), "");
139139
}
140140

141141
@Override

0 commit comments

Comments
 (0)