Skip to content

Commit acac50a

Browse files
committed
[#11930] Non-Youtube URLs should be ignored
1 parent c6b87cd commit acac50a

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import java.util.ArrayList;
6666
import java.util.Collections;
6767
import java.util.List;
68+
import java.util.Objects;
6869
import java.util.concurrent.atomic.AtomicBoolean;
6970
import java.util.stream.Collectors;
7071
import java.util.stream.Stream;
@@ -461,6 +462,7 @@ static String exportAsYoutubeTempPlaylist(final Stream<StreamEntity> entityStrea
461462

462463
final String videoIDs = entityStream
463464
.map(entity -> getYouTubeId(entity.getUrl()))
465+
.filter(Objects::nonNull)
464466
.collect(Collectors.joining(","));
465467

466468
return "http://www.youtube.com/watch_videos?video_ids=" + videoIDs;

app/src/test/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragmentTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public void exportAsYouTubeTempPlaylist() {
2020
final Stream<StreamEntity> entityStream = asStreamEntityStream(
2121

2222
"https://www.youtube.com/watch?v=1",
23-
"https://www.youtube.com/watch?v=2",
23+
"https://soundcloud.com/cautious-clayofficial/cold-war-2", // non-Youtube URLs should be
24+
"https://www.youtube.com/watch?v=2", // ignored
2425
"https://www.youtube.com/watch?v=3"
2526
);
2627

0 commit comments

Comments
 (0)