From 27b450f1e30a421b9bdf7d36193bd818aa8f809a Mon Sep 17 00:00:00 2001
From: Adam Howard <medavox2+github@gmail.com>
Date: Tue, 10 Nov 2015 17:09:26 +0000
Subject: [PATCH] minor commit: -removed now-redundant language code check

---
 .../java/org/schabi/newpipe/VideoItemListFragment.java |  4 ++--
 .../schabi/newpipe/youtube/YoutubeSearchEngine.java    | 10 ++--------
 app/src/main/res/xml/settings_screen.xml               |  4 +---
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index ce606697d..c9f6c0cd7 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -94,9 +94,9 @@ public class VideoItemListFragment extends ListFragment {
             try {
                 SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
                 String searchLanguageKey = getContext().getString(R.string.searchLanguage);
-                String searchLanguage = sp.getString(searchLanguageKey, "");
+                String searchLanguage = sp.getString(searchLanguageKey, "en");
                 SearchEngine.Result result = engine.search(query, page, searchLanguage);
-                Log.i(TAG, "countryCode passed:\""+searchLanguage+"\"");
+                Log.i(TAG, "language code passed:\""+searchLanguage+"\"");
                 if(run) {
                     h.post(new ResultRunnable(result, requestId));
                 }
diff --git a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java
index 79939aa5f..7d9631ac2 100644
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java
@@ -61,23 +61,17 @@ public class YoutubeSearchEngine implements SearchEngine {
 
         String site;
         String url = builder.build().toString();
-        //if we've been passed a valid, non-empty language code, append it to the URL
+        //if we've been passed a valid language code, append it to the URL
         if(languageCode.length() > 0) {
-            if(languageCode.length() == 2) {
+          //assert Pattern.matches("[a-z]{2}(-([A-Z]{2}|[0-9]{1,3}))?", languageCode);
                 Log.i(TAG, "URI: \""+builder+"\"");
                 site  = Downloader.download(url, languageCode);
-            }
-            else {
-                Log.e(TAG, "invalid language code passed to search(): \""+languageCode+"\"");
-                site = Downloader.download(url);
-            }
         }
         else {
             site = Downloader.download(url);
         }
 
 
-        //String site = Downloader.download(url);
         Document doc = Jsoup.parse(site, url);
         Result result = new Result();
         Element list = doc.select("ol[class=\"item-section\"]").first();
diff --git a/app/src/main/res/xml/settings_screen.xml b/app/src/main/res/xml/settings_screen.xml
index 251f4b202..a72dc87df 100644
--- a/app/src/main/res/xml/settings_screen.xml
+++ b/app/src/main/res/xml/settings_screen.xml
@@ -51,13 +51,11 @@
         android:title="@string/showNextAndSimilarTitle"
         android:defaultValue="true" />
 
-    <!-- This function is not yet available
     <ListPreference
         android:key="@string/searchLanguage"
         android:title="@string/searchLanguageTitle"
         android:entries="@array/languageNames"
         android:entryValues="@array/languageCodes"
         android:defaultValue="en" />
-
-    -->
+    
 </PreferenceScreen>
\ No newline at end of file