Skip to content

Commit 0dc3f10

Browse files
evermind-zzIsira-Seneviratne
evermind-zz
and
Isira-Seneviratne
committed
searchfilters: convert parameters where possible from ArrayList to List
Co-authored-by: Isira Seneviratne <31027858+Isira-Seneviratne@users.noreply.github.com>
1 parent 531fa38 commit 0dc3f10

4 files changed

Lines changed: 22 additions & 23 deletions

File tree

‎app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
164164
private TextWatcher textWatcher;
165165

166166
@State
167-
public ArrayList<Integer> userSelectedContentFilterList;
167+
ArrayList<Integer> userSelectedContentFilterList;
168168

169169
@State
170170
ArrayList<Integer> userSelectedSortFilterList = null;
@@ -1094,8 +1094,8 @@ private void showSelectFiltersDialog() {
10941094

10951095
@SuppressWarnings("checkstyle:HiddenField")
10961096
@Override
1097-
public void onFinishSearchFilterDialog(final ArrayList<Integer> userSelectedContentFilterList,
1098-
final ArrayList<Integer> userSelectedSortFilterList,
1097+
public void onFinishSearchFilterDialog(final List<Integer> userSelectedContentFilterList,
1098+
final List<Integer> userSelectedSortFilterList,
10991099
final List<FilterItem> selectedContentFilters,
11001100
final List<FilterItem> selectedSortFilters) {
11011101
selectedFilters(selectedContentFilters, selectedSortFilters);

‎app/src/main/java/org/schabi/newpipe/fragments/list/search/filter/BaseSearchFilterDialogFragment.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,23 @@ public abstract class BaseSearchFilterDialogFragment extends DialogFragment {
3030
private static final String CONTENT_FILTERS = "CONTENT_FILTERS";
3131
private static final String SORT_FILTERS = "SORT_FILTERS";
3232
private static final String SERVICE_ID = "SERVICE_ID";
33-
34-
@State
35-
public ArrayList<Integer> userSelectedContentFilterList;
3633
protected List<FilterItem> selectedContentFilters;
3734
protected List<FilterItem> selectedSortFilters;
3835
protected BaseSearchFilterUiGenerator dialogGenerator;
3936
@State
37+
ArrayList<Integer> userSelectedContentFilterList;
38+
@State
4039
ArrayList<Integer> userSelectedSortFilterList = null;
4140

4241
protected static DialogFragment initDialogArguments(
4342
final DialogFragment dialogFragment,
4443
final int serviceId,
45-
final ArrayList<Integer> userSelectedContentFilter,
46-
final ArrayList<Integer> userSelectedSortFilter) {
44+
final List<Integer> userSelectedContentFilter,
45+
final List<Integer> userSelectedSortFilter) {
4746
final Bundle bundle = new Bundle(1);
4847
bundle.putInt(SERVICE_ID, serviceId);
49-
bundle.putIntegerArrayList(CONTENT_FILTERS, userSelectedContentFilter);
50-
bundle.putIntegerArrayList(SORT_FILTERS, userSelectedSortFilter);
48+
bundle.putIntegerArrayList(CONTENT_FILTERS, new ArrayList<>(userSelectedContentFilter));
49+
bundle.putIntegerArrayList(SORT_FILTERS, new ArrayList<>(userSelectedSortFilter));
5150
dialogFragment.setArguments(bundle);
5251

5352
return dialogFragment;
@@ -167,8 +166,8 @@ private void sendDataToParentFragment() {
167166
*/
168167
public interface Listener {
169168

170-
void onFinishSearchFilterDialog(ArrayList<Integer> userSelectedContentFilterList,
171-
ArrayList<Integer> userSelectedSortFilterList,
169+
void onFinishSearchFilterDialog(List<Integer> userSelectedContentFilterList,
170+
List<Integer> userSelectedSortFilterList,
172171
List<FilterItem> selectedContentFilters,
173172
List<FilterItem> selectedSortFilters);
174173
}

‎app/src/main/java/org/schabi/newpipe/fragments/list/search/filter/SearchFilterDialogFragment.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.schabi.newpipe.databinding.SearchFilterDialogFragmentBinding;
1010
import org.schabi.newpipe.extractor.StreamingService;
1111

12-
import java.util.ArrayList;
12+
import java.util.List;
1313

1414
import androidx.appcompat.widget.Toolbar;
1515
import androidx.fragment.app.DialogFragment;
@@ -23,8 +23,8 @@ public class SearchFilterDialogFragment extends BaseSearchFilterDialogFragment {
2323

2424
public static DialogFragment newInstance(
2525
final int serviceId,
26-
final ArrayList<Integer> userSelectedContentFilter,
27-
final ArrayList<Integer> userSelectedSortFilter) {
26+
final List<Integer> userSelectedContentFilter,
27+
final List<Integer> userSelectedSortFilter) {
2828
return initDialogArguments(
2929
new SearchFilterDialogFragment(),
3030
serviceId,

‎app/src/main/java/org/schabi/newpipe/fragments/list/search/filter/SearchFilterLogic.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ public class SearchFilterLogic {
5454
* It contains all the content filter ids that the user has selected. It
5555
* contains the same ids than {@link #userSelectedContentFilters}
5656
*/
57-
private ArrayList<Integer> selectedContentFilters = new ArrayList<>();
57+
private List<Integer> selectedContentFilters = new ArrayList<>();
5858
/**
5959
* This list is used to store via Icepick and eventual store as preset
6060
* It contains all the sort filter ids that the user has selected and also
6161
* default id of none visible but selected sort filters.
6262
* It is a superset to {@link #userSelectedContentFilters}.
6363
*/
64-
private ArrayList<Integer> selectedSortFilters = new ArrayList<>();
64+
private List<Integer> selectedSortFilters = new ArrayList<>();
6565

6666
/**
6767
* Store a reference of the sort filters Ui creator. This is needed
@@ -90,7 +90,7 @@ public void reset() {
9090
showSortFilterContainerUI();
9191
}
9292

93-
private void reInitExclusiveFilterIds(final ArrayList<Integer> selectedFilters,
93+
private void reInitExclusiveFilterIds(final List<Integer> selectedFilters,
9494
final ExclusiveGroups exclusive) {
9595
checkIfIdsAreValid(selectedFilters, exclusive);
9696

@@ -100,8 +100,8 @@ private void reInitExclusiveFilterIds(final ArrayList<Integer> selectedFilters,
100100
}
101101
}
102102

103-
public void restorePreviouslySelectedFilters(final ArrayList<Integer> selectedContentFilterList,
104-
final ArrayList<Integer> selectedSortFilterList) {
103+
public void restorePreviouslySelectedFilters(final List<Integer> selectedContentFilterList,
104+
final List<Integer> selectedSortFilterList) {
105105
if (selectedContentFilterList != null && selectedSortFilterList != null
106106
&& !selectedContentFilterList.isEmpty()) {
107107
reInitExclusiveFilterIds(selectedContentFilterList, contentFilterExclusive);
@@ -222,7 +222,7 @@ private void initFiltersUi(final FilterGroup[] filterGroups,
222222
private void initFilters(
223223
final FilterGroup[] filterGroups,
224224
final ExclusiveGroups exclusive,
225-
final ArrayList<Integer> selectedFilters,
225+
final List<Integer> selectedFilters,
226226
@Nullable final Map<Integer, FilterContainer> fidToSupersetSortFilterMap) {
227227
selectedFilters.clear();
228228
exclusive.clear();
@@ -252,7 +252,7 @@ private void initFilters(
252252
checkIfIdsAreValid(selectedFilters, exclusive);
253253
}
254254

255-
private void checkIfIdsAreValid(final ArrayList<Integer> selectedFilters,
255+
private void checkIfIdsAreValid(final List<Integer> selectedFilters,
256256
final ExclusiveGroups exclusive) {
257257
for (final int id : selectedFilters) {
258258
if (!exclusive.filterIdToGroupIdMapContainsId(id)) {
@@ -472,7 +472,7 @@ public synchronized void selectSortFilter(final int filterId) {
472472

473473
private void selectFilter(final int id,
474474
final Map<Integer, IUiItemWrapper> filterIdToUiItemMap,
475-
final ArrayList<Integer> selectedFilter,
475+
final List<Integer> selectedFilter,
476476
final ExclusiveGroups exclusive) {
477477
final IUiItemWrapper uiItemWrapper =
478478
filterIdToUiItemMap.get(id);

0 commit comments

Comments
 (0)