mirror
/
NewPipe
kopia lustrzana https://github.com/TeamNewPipe/NewPipe
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Improve search suggestion code

pull/3471/head
wb9688 2020-06-28 15:15:51 +02:00 zatwierdzone przez Stypox
rodzic 0711650ff8
commit ccd82fb8b8
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4BDF1B40A49FDD23
1 zmienionych plików z 8 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
Wyświetl plik

@ -119,7 +119,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
String lastSearchedString; String lastSearchedString;
@State @State
String searchSuggestionString; String searchSuggestion;
@State @State
boolean isCorrectedSearch; boolean isCorrectedSearch;
@ -266,9 +266,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
} }
} }
if (!TextUtils.isEmpty(searchSuggestionString)) { handleSearchSuggestion();
handleSearchSuggestion(searchSuggestionString, isCorrectedSearch);
}
if (suggestionDisposable == null || suggestionDisposable.isDisposed()) { if (suggestionDisposable == null || suggestionDisposable.isDisposed()) {
initSuggestionObserver(); initSuggestionObserver();
@ -981,10 +979,11 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
NewPipe.getNameOfService(serviceId), searchString, 0); NewPipe.getNameOfService(serviceId), searchString, 0);
} }
handleSearchSuggestion(result.getSearchSuggestion(), result.isCorrectedSearch()); searchSuggestion = result.getSearchSuggestion();
searchSuggestionString = result.getSearchSuggestion();
isCorrectedSearch = result.isCorrectedSearch(); isCorrectedSearch = result.isCorrectedSearch();
handleSearchSuggestion();
lastSearchedString = searchString; lastSearchedString = searchString;
nextPageUrl = result.getNextPageUrl(); nextPageUrl = result.getNextPageUrl();
currentPageUrl = result.getUrl(); currentPageUrl = result.getUrl();
@ -1002,10 +1001,9 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
super.handleResult(result); super.handleResult(result);
} }
private void handleSearchSuggestion(@NonNull final String searchSuggestion, private void handleSearchSuggestion() {
@NonNull final Boolean isCorrected) {
if (!TextUtils.isEmpty(searchSuggestion)) { if (!TextUtils.isEmpty(searchSuggestion)) {
String helperText = getString(isCorrected final String helperText = getString(isCorrectedSearch
? R.string.search_showing_result_for ? R.string.search_showing_result_for
: R.string.did_you_mean); : R.string.did_you_mean);