From fc31458cc408e0f3cfba310553aee0e54f46b6af Mon Sep 17 00:00:00 2001
From: Ritvik Saraf <13ritvik@gmail.com>
Date: Fri, 12 Oct 2018 02:34:30 +0530
Subject: [PATCH] added peertube

---
 app/build.gradle                                          | 2 +-
 app/src/main/java/org/schabi/newpipe/App.java             | 3 ++-
 app/src/main/java/org/schabi/newpipe/Downloader.java      | 7 ++++---
 .../java/org/schabi/newpipe/util/ExtractorHelper.java     | 8 +++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2104d2023..5e634d9b9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,7 +55,7 @@ dependencies {
         exclude module: 'support-annotations'
     }
 
-    implementation 'com.github.yausername:NewPipeExtractor:d1ff1c7'
+    implementation 'com.github.yausername:NewPipeExtractor:c9fba9c'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.8.9'
diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index dfce8f100..c0af70efb 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -21,6 +21,7 @@ import org.acra.config.ConfigurationBuilder;
 import org.acra.sender.ReportSenderFactory;
 import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.utils.Localization;
 import org.schabi.newpipe.report.AcraReportSenderFactory;
 import org.schabi.newpipe.report.ErrorActivity;
 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
         SettingsActivity.initSettings(this);
 
-        NewPipe.init(getDownloader());
+        NewPipe.init(getDownloader(), new Localization("GB", "en"));
         StateSaver.init(this);
         initNotificationChannel();
 
diff --git a/app/src/main/java/org/schabi/newpipe/Downloader.java b/app/src/main/java/org/schabi/newpipe/Downloader.java
index 16f2ed4ae..8ff2b839a 100644
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -6,6 +6,7 @@ import android.text.TextUtils;
 import org.schabi.newpipe.extractor.DownloadRequest;
 import org.schabi.newpipe.extractor.DownloadResponse;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.utils.Localization;
 
 import java.io.IOException;
 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.
      *
      * @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
      */
     @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<>();
-        requestProperties.put("Accept-Language", language);
+        requestProperties.put("Accept-Language", localization.getLanguage());
         return download(siteUrl, requestProperties);
     }
 
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 5a9911a67..e328ad23e 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@@ -76,8 +76,7 @@ public final class ExtractorHelper {
             SearchInfo.getInfo(NewPipe.getService(serviceId),
                     NewPipe.getService(serviceId)
                         .getSearchQHFactory()
-                        .fromQuery(searchString, contentFilter, sortFilter),
-                    contentCountry));
+                        .fromQuery(searchString, contentFilter, sortFilter)));
     }
 
     public static Single<InfoItemsPage> getMoreSearchItems(final int serviceId,
@@ -92,7 +91,6 @@ public final class ExtractorHelper {
                         NewPipe.getService(serviceId)
                             .getSearchQHFactory()
                             .fromQuery(searchString, contentFilter, sortFilter),
-                        contentCountry,
                         pageUrl));
 
     }
@@ -104,7 +102,7 @@ public final class ExtractorHelper {
         return Single.fromCallable(() ->
                 NewPipe.getService(serviceId)
                         .getSuggestionExtractor()
-                        .suggestionList(query, contentCountry));
+                        .suggestionList(query));
     }
 
     public static Single<StreamInfo> getStreamInfo(final int serviceId,
@@ -128,7 +126,7 @@ public final class ExtractorHelper {
                                                             final String nextStreamsUrl) {
         checkServiceId(serviceId);
         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,