MaintainTeam/LastPipeBender
1
0
Fork 0
mirror of https://github.com/MaintainTeam/LastPipeBender.git synced 2025-03-02 22:38:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "cleanup SearchFragment: remove some not used parameters and method"

Browse source 
This reverts commit e84364ed38.
This commit is contained in:
evermind 2022-12-08 23:53:40 +01:00
parent 50ddee767b
commit 16b1c53bd6
1 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
View file

@ -136,6 +136,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
@State @State
boolean wasSearchFocused = false; boolean wasSearchFocused = false;
private StreamingService service;
private Page nextPage; private Page nextPage;
private boolean showLocalSuggestions = true; private boolean showLocalSuggestions = true;
private boolean showRemoteSuggestions = true; private boolean showRemoteSuggestions = true;
@ -183,7 +184,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
searchFragment = new SearchFragment(); searchFragment = new SearchFragment();
} }
searchFragment.setQuery(serviceId, searchString); searchFragment.setQuery(serviceId, searchString, null, null);
if (!TextUtils.isEmpty(searchString)) { if (!TextUtils.isEmpty(searchString)) {
searchFragment.setSearchOnResume(); searchFragment.setSearchOnResume();
@ -228,6 +229,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
userSelectedSortFilterList = new ArrayList<>(); userSelectedSortFilterList = new ArrayList<>();
} }
initializeFilterData(); initializeFilterData();
updateService();
return inflater.inflate(R.layout.fragment_search, container, false); return inflater.inflate(R.layout.fragment_search, container, false);
} }
@ -261,12 +263,22 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
initSearchListeners(); initSearchListeners();
} }
private void updateService() {
try {
service = NewPipe.getService(serviceId);
} catch (final Exception e) {
ErrorUtil.showUiErrorSnackbar(this, "Getting service for id " + serviceId, e);
}
}
@Override @Override
public void onStart() { public void onStart() {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "onStart() called"); Log.d(TAG, "onStart() called");
} }
super.onStart(); super.onStart();
updateService();
} }
@Override @Override
@ -298,11 +310,11 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
if (!TextUtils.isEmpty(searchString)) { if (!TextUtils.isEmpty(searchString)) {
if (wasLoading.getAndSet(false)) { if (wasLoading.getAndSet(false)) {
search(searchString); search(searchString, selectedContentFilter, selectedSortFilter);
return; return;
} else if (infoListAdapter.getItemsList().isEmpty()) { } else if (infoListAdapter.getItemsList().isEmpty()) {
if (savedState == null) { if (savedState == null) {
search(searchString); search(searchString, selectedContentFilter, selectedSortFilter);
return; return;
} else if (!isLoading.get() && !wasSearchFocused && lastPanelError == null) { } else if (!isLoading.get() && !wasSearchFocused && lastPanelError == null) {
infoListAdapter.clearStreamItemList(); infoListAdapter.clearStreamItemList();
@ -355,7 +367,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
if (requestCode == ReCaptchaActivity.RECAPTCHA_REQUEST) { if (requestCode == ReCaptchaActivity.RECAPTCHA_REQUEST) {
if (resultCode == Activity.RESULT_OK if (resultCode == Activity.RESULT_OK
&& !TextUtils.isEmpty(searchString)) { && !TextUtils.isEmpty(searchString)) {
search(searchString); search(searchString, selectedContentFilter, selectedSortFilter);
} else { } else {
Log.e(TAG, "ReCaptcha failed"); Log.e(TAG, "ReCaptcha failed");
} }
@ -435,7 +447,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
|| (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) { || (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) {
search(!TextUtils.isEmpty(searchString) search(!TextUtils.isEmpty(searchString)
? searchString ? searchString
: searchEditText.getText().toString()); : searchEditText.getText().toString(), this.selectedContentFilter, null);
} else { } else {
if (searchEditText != null) { if (searchEditText != null) {
searchEditText.setText(""); searchEditText.setText("");
@ -460,6 +472,11 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
supportActionBar.setDisplayHomeAsUpEnabled(true); supportActionBar.setDisplayHomeAsUpEnabled(true);
} }
if (service == null) {
Log.w(TAG, "onCreateOptionsMenu() called with null service");
updateService();
}
createMenu(menu, inflater); createMenu(menu, inflater);
} }
@ -555,7 +572,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
suggestionListAdapter.setListener(new SuggestionListAdapter.OnSuggestionItemSelected() { suggestionListAdapter.setListener(new SuggestionListAdapter.OnSuggestionItemSelected() {
@Override @Override
public void onSuggestionItemSelected(final SuggestionItem item) { public void onSuggestionItemSelected(final SuggestionItem item) {
search(item.query); search(item.query, null, null);
searchEditText.setText(item.query); searchEditText.setText(item.query);
} }
@ -610,7 +627,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
} else if (event != null } else if (event != null
&& (event.getKeyCode() == KeyEvent.KEYCODE_ENTER && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
|| event.getAction() == EditorInfo.IME_ACTION_SEARCH)) { || event.getAction() == EditorInfo.IME_ACTION_SEARCH)) {
search(searchEditText.getText().toString()); search(searchEditText.getText().toString(), null, null);
return true; return true;
} }
return false; return false;
@ -796,7 +813,9 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
// no-op // no-op
} }
private void search(final String theSearchString) { private void search(final String theSearchString,
final List<FilterItem> theContentFilter,
final List<FilterItem> theSortFilter) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "search() called with: query = [" + theSearchString + "]"); Log.d(TAG, "search() called with: query = [" + theSearchString + "]");
} }
@ -913,12 +932,14 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
selectedSortFilter = theSelectedSortFilter; selectedSortFilter = theSelectedSortFilter;
if (!TextUtils.isEmpty(searchString)) { if (!TextUtils.isEmpty(searchString)) {
search(searchString); search(searchString, selectedContentFilter, selectedSortFilter);
} }
} }
private void setQuery(final int theServiceId, private void setQuery(final int theServiceId,
final String theSearchString) { final String theSearchString,
final List<FilterItem> theContentFilter,
final List<FilterItem> theSortFilter) {
serviceId = theServiceId; serviceId = theServiceId;
searchString = theSearchString; searchString = theSearchString;
} }
@ -1005,7 +1026,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
searchBinding.correctSuggestion.setOnClickListener(v -> { searchBinding.correctSuggestion.setOnClickListener(v -> {
searchBinding.correctSuggestion.setVisibility(View.GONE); searchBinding.correctSuggestion.setVisibility(View.GONE);
search(searchSuggestion); search(searchSuggestion, selectedContentFilter, selectedSortFilter);
searchEditText.setText(searchSuggestion); searchEditText.setText(searchSuggestion);
}); });