Avoid potential NPEs in Soundcloud extractors

Author: Isira-Seneviratne

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java

@@ -23,6 +23,7 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudChannelInfoItemExtractor;
 import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudPlaylistInfoItemExtractor;
 import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudLikesInfoItemExtractor;
@@ -133,16 +134,20 @@ public static synchronized String clientId() throws ExtractionException, IOExcep
         throw new ExtractionException("Couldn't extract client id");
     }
 
-    public static OffsetDateTime parseDateFrom(final String textualUploadDate)
+    @Nullable
+    public static DateWrapper parseDateFrom(@Nullable final String uploadDate)
             throws ParsingException {
+        if (uploadDate == null) {
+            return null;
+        }
         try {
-            return OffsetDateTime.parse(textualUploadDate);
+            return new DateWrapper(OffsetDateTime.parse(uploadDate));
         } catch (final DateTimeParseException e1) {
             try {
-                return OffsetDateTime.parse(textualUploadDate, DateTimeFormatter
-                        .ofPattern("yyyy/MM/dd HH:mm:ss +0000"));
+                final var formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss +0000");
+                return new DateWrapper(OffsetDateTime.parse(uploadDate, formatter));
             } catch (final DateTimeParseException e2) {
-                throw new ParsingException("Could not parse date: \"" + textualUploadDate + "\""
+                throw new ParsingException("Could not parse date: \"" + uploadDate + "\""
                         + ", " + e1.getMessage(), e2);
             }
         }

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java

@@ -69,7 +69,7 @@ public String getTextualUploadDate() {
     @Nullable
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
-        return new DateWrapper(parseDateFrom(getTextualUploadDate()));
+        return parseDateFrom(getTextualUploadDate());
     }
 
     @Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamExtractor.java

@@ -88,18 +88,16 @@ public String getName() {
         return track.getString("title");
     }
 
-    @Nonnull
+    @Nullable
     @Override
     public String getTextualUploadDate() {
-        return track.getString("created_at")
-                .replace("T", " ")
-                .replace("Z", "");
+        return track.getString("created_at");
     }
 
-    @Nonnull
+    @Nullable
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
-        return new DateWrapper(parseDateFrom(track.getString("created_at")));
+        return parseDateFrom(getTextualUploadDate());
     }
 
     @Nonnull

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamInfoItemExtractor.java

@@ -68,7 +68,7 @@ public String getTextualUploadDate() {
 
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
-        return new DateWrapper(parseDateFrom(getTextualUploadDate()));
+        return parseDateFrom(getTextualUploadDate());
     }
 
     @Override