Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

added peertube

This commit is contained in:
Ritvik Saraf 2018-10-12 02:34:30 +05:30
parent cf3e53eb71
commit fc31458cc4
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -55,7 +55,7 @@ dependencies {
exclude module: 'support-annotations' exclude module: 'support-annotations'
} }
implementation 'com.github.yausername:NewPipeExtractor:d1ff1c7' implementation 'com.github.yausername:NewPipeExtractor:c9fba9c'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.8.9' testImplementation 'org.mockito:mockito-core:2.8.9'

3
app/src/main/java/org/schabi/newpipe/App.java
View File

@ -21,6 +21,7 @@ import org.acra.config.ConfigurationBuilder;
import org.acra.sender.ReportSenderFactory; import org.acra.sender.ReportSenderFactory;
import org.schabi.newpipe.extractor.Downloader; import org.schabi.newpipe.extractor.Downloader;
import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.NewPipe;
import org.schabi.newpipe.extractor.utils.Localization;
import org.schabi.newpipe.report.AcraReportSenderFactory; import org.schabi.newpipe.report.AcraReportSenderFactory;
import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.report.ErrorActivity;
import org.schabi.newpipe.report.UserAction; import org.schabi.newpipe.report.UserAction;
@ -88,7 +89,7 @@ public class App extends Application {
// Initialize settings first because others inits can use its values // Initialize settings first because others inits can use its values
SettingsActivity.initSettings(this); SettingsActivity.initSettings(this);
NewPipe.init(getDownloader()); NewPipe.init(getDownloader(), new Localization("GB", "en"));
StateSaver.init(this); StateSaver.init(this);
initNotificationChannel(); initNotificationChannel();

7
app/src/main/java/org/schabi/newpipe/Downloader.java
View File

@ -6,6 +6,7 @@ import android.text.TextUtils;
import org.schabi.newpipe.extractor.DownloadRequest; import org.schabi.newpipe.extractor.DownloadRequest;
import org.schabi.newpipe.extractor.DownloadResponse; import org.schabi.newpipe.extractor.DownloadResponse;
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException; import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
import org.schabi.newpipe.extractor.utils.Localization;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -109,13 +110,13 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
* but set the HTTP header field "Accept-Language" to the supplied string. * but set the HTTP header field "Accept-Language" to the supplied string.
* *
* @param siteUrl the URL of the text file to return the contents of * @param siteUrl the URL of the text file to return the contents of
* @param language the language (usually a 2-character code) to set as the preferred language * @param localization the language and country (usually a 2-character code for both values)
* @return the contents of the specified text file * @return the contents of the specified text file
*/ */
@Override @Override
public String download(String siteUrl, String language) throws IOException, ReCaptchaException { public String download(String siteUrl, Localization localization) throws IOException, ReCaptchaException {
Map<String, String> requestProperties = new HashMap<>(); Map<String, String> requestProperties = new HashMap<>();
requestProperties.put("Accept-Language", language); requestProperties.put("Accept-Language", localization.getLanguage());
return download(siteUrl, requestProperties); return download(siteUrl, requestProperties);
} }

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

@ -76,8 +76,7 @@ public final class ExtractorHelper {
SearchInfo.getInfo(NewPipe.getService(serviceId), SearchInfo.getInfo(NewPipe.getService(serviceId),
NewPipe.getService(serviceId) NewPipe.getService(serviceId)
.getSearchQHFactory() .getSearchQHFactory()
.fromQuery(searchString, contentFilter, sortFilter), .fromQuery(searchString, contentFilter, sortFilter)));
contentCountry));
} }
public static Single<InfoItemsPage> getMoreSearchItems(final int serviceId, public static Single<InfoItemsPage> getMoreSearchItems(final int serviceId,
@ -92,7 +91,6 @@ public final class ExtractorHelper {
NewPipe.getService(serviceId) NewPipe.getService(serviceId)
.getSearchQHFactory() .getSearchQHFactory()
.fromQuery(searchString, contentFilter, sortFilter), .fromQuery(searchString, contentFilter, sortFilter),
contentCountry,
pageUrl)); pageUrl));
} }
@ -104,7 +102,7 @@ public final class ExtractorHelper {
return Single.fromCallable(() -> return Single.fromCallable(() ->
NewPipe.getService(serviceId) NewPipe.getService(serviceId)
.getSuggestionExtractor() .getSuggestionExtractor()
.suggestionList(query, contentCountry)); .suggestionList(query));
} }
public static Single<StreamInfo> getStreamInfo(final int serviceId, public static Single<StreamInfo> getStreamInfo(final int serviceId,
@ -128,7 +126,7 @@ public final class ExtractorHelper {
final String nextStreamsUrl) { final String nextStreamsUrl) {
checkServiceId(serviceId); checkServiceId(serviceId);
return Single.fromCallable(() -> return Single.fromCallable(() ->
ChannelInfo.getMoreItems(NewPipe.getService(serviceId), url, nextStreamsUrl)); ChannelInfo.getMoreItems(NewPipe.getService(serviceId), url, nextStreamsUrl, NewPipe.getLocalization()));
} }
public static Single<CommentsInfo> getCommentsInfo(final int serviceId, public static Single<CommentsInfo> getCommentsInfo(final int serviceId,