Skip to content

Commit fc3a69e

Browse files
authored
Merge pull request #323 from wb9688/fix-yt-music-albums
Fix NPE in defaultAlertsCheck()
2 parents 2780e71 + 6aae99f commit fc3a69e

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeParsingHelper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.*;
2929

3030
import static org.schabi.newpipe.extractor.NewPipe.getDownloader;
31+
import static org.schabi.newpipe.extractor.utils.JsonUtils.EMPTY_STRING;
3132
import static org.schabi.newpipe.extractor.utils.Utils.HTTP;
3233
import static org.schabi.newpipe.extractor.utils.Utils.HTTPS;
3334

@@ -494,12 +495,12 @@ public static JsonArray getJsonResponse(final String url, final Localization loc
494495
* @param initialData the object which will be checked if an alert is present
495496
* @throws ContentNotAvailableException if an alert is detected
496497
*/
497-
public static void defaultAlertsCheck(JsonObject initialData) throws ContentNotAvailableException {
498+
public static void defaultAlertsCheck(final JsonObject initialData) throws ParsingException {
498499
final JsonArray alerts = initialData.getArray("alerts");
499500
if (!alerts.isEmpty()) {
500501
final JsonObject alertRenderer = alerts.getObject(0).getObject("alertRenderer");
501-
final String alertText = alertRenderer.getObject("text").getString("simpleText");
502-
final String alertType = alertRenderer.getString("type");
502+
final String alertText = getTextFromObject(alertRenderer.getObject("text"));
503+
final String alertType = alertRenderer.getString("type", EMPTY_STRING);
503504
if (alertType.equalsIgnoreCase("ERROR")) {
504505
throw new ContentNotAvailableException("Got error: \"" + alertText + "\"");
505506
}

0 commit comments

Comments
 (0)