From 939017ada9d640fb071a744e35a628301b06e77f Mon Sep 17 00:00:00 2001
From: Mauricio Colli <mauriciocolli@outlook.com>
Date: Mon, 11 Sep 2017 11:21:01 -0300
Subject: [PATCH] Update extractor version

---
 app/build.gradle                                         | 2 +-
 .../newpipe/fragments/list/channel/ChannelFragment.java  | 2 +-
 .../fragments/list/playlist/PlaylistFragment.java        | 2 +-
 .../java/org/schabi/newpipe/util/ExtractorHelper.java    | 9 ++++-----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a6a10f718..d505f4272 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ dependencies {
         exclude module: 'support-annotations'
     }
 
-    compile 'com.github.TeamNewPipe:NewPipeExtractor:f308755'
+    compile 'com.github.TeamNewPipe:NewPipeExtractor:7ae274b'
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
index 8645c94d6..b7148fe63 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -302,7 +302,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
 
     @Override
     protected Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() {
-        return ExtractorHelper.getMoreChannelItems(serviceId, currentNextItemsUrl);
+        return ExtractorHelper.getMoreChannelItems(serviceId, url, currentNextItemsUrl);
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
index 1ba700fd6..eeb95f9b1 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -90,7 +90,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
 
     @Override
     protected Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() {
-        return ExtractorHelper.getMorePlaylistItems(serviceId, currentNextItemsUrl);
+        return ExtractorHelper.getMorePlaylistItems(serviceId, url, currentNextItemsUrl);
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
index 8d5636804..5cf9f057e 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@@ -32,7 +32,6 @@ import org.schabi.newpipe.extractor.search.SearchResult;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 
 import java.io.InterruptedIOException;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Callable;
 
@@ -98,11 +97,11 @@ public final class ExtractorHelper {
         }));
     }
 
-    public static Single<NextItemsResult> getMoreChannelItems(final int serviceId, final String nextStreamsUrl) {
+    public static Single<NextItemsResult> getMoreChannelItems(final int serviceId, final String url, final String nextStreamsUrl) {
         return Single.fromCallable(new Callable<NextItemsResult>() {
             @Override
             public NextItemsResult call() throws Exception {
-                return ChannelInfo.getMoreItems(NewPipe.getService(serviceId), nextStreamsUrl);
+                return ChannelInfo.getMoreItems(NewPipe.getService(serviceId), url, nextStreamsUrl);
             }
         });
     }
@@ -116,11 +115,11 @@ public final class ExtractorHelper {
         }));
     }
 
-    public static Single<NextItemsResult> getMorePlaylistItems(final int serviceId, final String nextStreamsUrl) {
+    public static Single<NextItemsResult> getMorePlaylistItems(final int serviceId, final String url, final String nextStreamsUrl) {
         return Single.fromCallable(new Callable<NextItemsResult>() {
             @Override
             public NextItemsResult call() throws Exception {
-                return PlaylistInfo.getMoreItems(NewPipe.getService(serviceId), nextStreamsUrl);
+                return PlaylistInfo.getMoreItems(NewPipe.getService(serviceId), url, nextStreamsUrl);
             }
         });
     }