From 1558da6f6b2aa4613c6af45f302104b1464d28a0 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Tue, 17 Mar 2020 15:41:16 +0100
Subject: [PATCH] [SoundCloud] Fix playlist next page generation

---
 .../services/soundcloud/SoundcloudPlaylistExtractor.java   | 3 ++-
 .../soundcloud/SoundcloudPlaylistExtractorTest.java        | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java
index f503ac0fe..a57abea8b 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java
@@ -145,7 +145,7 @@ public class SoundcloudPlaylistExtractor extends PlaylistExtractor {
     }
 
     private void computeAnotherNextPageUrl() throws IOException, ExtractionException {
-        if (nextTrackIdsIndex >= nextTrackIds.size()) {
+        if (nextTrackIds == null || nextTrackIdsIndex >= nextTrackIds.size()) {
             nextPageUrl = ""; // there are no more tracks
             return;
         }
@@ -160,6 +160,7 @@ public class SoundcloudPlaylistExtractor extends PlaylistExtractor {
             urlBuilder.append(","); // a , at the end is ok
         }
 
+        nextTrackIdsIndex = upperIndex;
         nextPageUrl = urlBuilder.toString();
     }
 
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java
index 067633bbe..f0832ef28 100644
--- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java
+++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java
@@ -7,10 +7,13 @@ import org.junit.Test;
 import org.schabi.newpipe.DownloaderTestImpl;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
 import org.schabi.newpipe.extractor.services.BasePlaylistExtractorTest;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 
+import java.io.IOException;
+
 import static org.junit.Assert.*;
 import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
 import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
@@ -70,7 +73,9 @@ public class SoundcloudPlaylistExtractorTest {
         }
 
         @Test
-        public void testMoreRelatedItems() {
+        public void testMoreRelatedItems() throws Exception {
+            defaultTestMoreItems(extractor);
+
             try {
                 defaultTestMoreItems(extractor);
             } catch (Throwable ignored) {