Skip to content

Commit 27b450f

Browse files
committed
minor commit:
-removed now-redundant language code check
1 parent 9e7d9ee commit 27b450f

3 files changed

Lines changed: 5 additions & 13 deletions

File tree

app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ public void run() {
9494
try {
9595
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
9696
String searchLanguageKey = getContext().getString(R.string.searchLanguage);
97-
String searchLanguage = sp.getString(searchLanguageKey, "");
97+
String searchLanguage = sp.getString(searchLanguageKey, "en");
9898
SearchEngine.Result result = engine.search(query, page, searchLanguage);
99-
Log.i(TAG, "countryCode passed:\""+searchLanguage+"\"");
99+
Log.i(TAG, "language code passed:\""+searchLanguage+"\"");
100100
if(run) {
101101
h.post(new ResultRunnable(result, requestId));
102102
}

app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,17 @@ public Result search(String query, int page, String languageCode) {
6161

6262
String site;
6363
String url = builder.build().toString();
64-
//if we've been passed a valid, non-empty language code, append it to the URL
64+
//if we've been passed a valid language code, append it to the URL
6565
if(languageCode.length() > 0) {
66-
if(languageCode.length() == 2) {
66+
//assert Pattern.matches("[a-z]{2}(-([A-Z]{2}|[0-9]{1,3}))?", languageCode);
6767
Log.i(TAG, "URI: \""+builder+"\"");
6868
site = Downloader.download(url, languageCode);
69-
}
70-
else {
71-
Log.e(TAG, "invalid language code passed to search(): \""+languageCode+"\"");
72-
site = Downloader.download(url);
73-
}
7469
}
7570
else {
7671
site = Downloader.download(url);
7772
}
7873

7974

80-
//String site = Downloader.download(url);
8175
Document doc = Jsoup.parse(site, url);
8276
Result result = new Result();
8377
Element list = doc.select("ol[class=\"item-section\"]").first();

app/src/main/res/xml/settings_screen.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,11 @@
5151
android:title="@string/showNextAndSimilarTitle"
5252
android:defaultValue="true" />
5353

54-
<!-- This function is not yet available
5554
<ListPreference
5655
android:key="@string/searchLanguage"
5756
android:title="@string/searchLanguageTitle"
5857
android:entries="@array/languageNames"
5958
android:entryValues="@array/languageCodes"
6059
android:defaultValue="en" />
61-
62-
-->
60+
6361
</PreferenceScreen>

0 commit comments

Comments
 (0)