mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-12-25 17:40:33 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2017-09-11 23:15:20 +02:00
commit c5885d9ce4
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -44,7 +44,7 @@ dependencies {
exclude module: 'support-annotations' exclude module: 'support-annotations'
} }
compile 'com.github.TeamNewPipe:NewPipeExtractor:f308755' compile 'com.github.TeamNewPipe:NewPipeExtractor:7ae274b'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19' testCompile 'org.mockito:mockito-core:1.10.19'

2
app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
View File

@ -302,7 +302,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
@Override @Override
protected Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() { protected Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() {
return ExtractorHelper.getMoreChannelItems(serviceId, currentNextItemsUrl); return ExtractorHelper.getMoreChannelItems(serviceId, url, currentNextItemsUrl);
} }
@Override @Override

2
app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
View File

@ -90,7 +90,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
@Override @Override
protected Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() { protected Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() {
return ExtractorHelper.getMorePlaylistItems(serviceId, currentNextItemsUrl); return ExtractorHelper.getMorePlaylistItems(serviceId, url, currentNextItemsUrl);
} }
@Override @Override

9
app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
View File

@ -32,7 +32,6 @@ import org.schabi.newpipe.extractor.search.SearchResult;
import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.StreamInfo;
import java.io.InterruptedIOException; import java.io.InterruptedIOException;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.Callable; 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>() { return Single.fromCallable(new Callable<NextItemsResult>() {
@Override @Override
public NextItemsResult call() throws Exception { 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>() { return Single.fromCallable(new Callable<NextItemsResult>() {
@Override @Override
public NextItemsResult call() throws Exception { public NextItemsResult call() throws Exception {
return PlaylistInfo.getMoreItems(NewPipe.getService(serviceId), nextStreamsUrl); return PlaylistInfo.getMoreItems(NewPipe.getService(serviceId), url, nextStreamsUrl);
} }
}); });
} }