Skip to content

Commit 531fa38

Browse files
committed
searchfilters: remove onResume() onPause() calles
Those calles are no longer needed as the causing null ptr problem was solved using the convertView paramter instead of locally cache the TextView's in the Spinner Adapter.
1 parent dd13ec4 commit 531fa38

7 files changed

Lines changed: 0 additions & 86 deletions

File tree

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,19 +109,6 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
109109
return rootView;
110110
}
111111

112-
113-
@Override
114-
public void onResume() {
115-
super.onResume();
116-
dialogGenerator.onResume();
117-
}
118-
119-
@Override
120-
public void onStop() {
121-
dialogGenerator.onPause();
122-
super.onStop();
123-
}
124-
125112
@Override
126113
public void onViewCreated(@NonNull final View view, final Bundle savedInstanceState) {
127114
super.onViewCreated(view, savedInstanceState);

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,13 @@
1010
import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandlerFactory;
1111
import org.schabi.newpipe.extractor.search.filter.FilterGroup;
1212

13-
import java.util.HashMap;
1413
import java.util.List;
15-
import java.util.Map;
1614

1715
import static android.util.TypedValue.COMPLEX_UNIT_DIP;
1816

1917
public abstract class BaseSearchFilterUiDialogGenerator extends BaseSearchFilterUiGenerator {
2018
private static final float FONT_SIZE_TITLE_ITEMS_IN_DIP = 20f;
2119

22-
protected final Map<View, View.OnClickListener> viewListeners = new HashMap<>();
23-
2420
protected BaseSearchFilterUiDialogGenerator(
2521
final SearchQueryHandlerFactory linkHandlerFactory,
2622
final Callback callback,
@@ -44,20 +40,6 @@ protected ICreateUiForFiltersWorker createSortFilterWorker() {
4440
return new BaseCreateSearchFilterUI.CreateSortFilterUI(this, context);
4541
}
4642

47-
@Override
48-
public void onResume() {
49-
for (final Map.Entry<View, View.OnClickListener> view : viewListeners.entrySet()) {
50-
view.getKey().setOnClickListener(view.getValue());
51-
}
52-
}
53-
54-
@Override
55-
public void onPause() {
56-
for (final Map.Entry<View, View.OnClickListener> view : viewListeners.entrySet()) {
57-
view.getKey().setOnClickListener(null);
58-
}
59-
}
60-
6143
protected View createSeparatorLine(final ViewGroup.LayoutParams layoutParams) {
6244
final View separatorLine = new View(context);
6345
separatorLine.setBackgroundColor(getSeparatorLineColorFromTheme());

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,6 @@ protected void doMeasurementsIfNeeded() {
6666
// nothing to measure here, if you want to measure something override this method
6767
}
6868

69-
/**
70-
* If UI is implemented within an fragment/activity this method has to be called from
71-
* its corresponding lifecyle method manually.
72-
*/
73-
public abstract void onResume();
74-
75-
/**
76-
* If UI is implemented within an fragment/activity this method has to be called from
77-
* its corresponding lifecyle method manually.
78-
*/
79-
public abstract void onPause();
80-
8169
/**
8270
* Helper interface used as 'function pointer'.
8371
*/

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@
2121
import org.schabi.newpipe.util.DeviceUtils;
2222
import org.schabi.newpipe.util.ServiceHelper;
2323

24-
import java.util.HashMap;
2524
import java.util.List;
26-
import java.util.Map;
2725

2826
import androidx.appcompat.view.ContextThemeWrapper;
2927

3028
public class SearchFilterDialogGenerator extends BaseSearchFilterUiDialogGenerator {
3129
private final GridLayout globalLayout;
32-
private final Map<Spinner, AdapterView.OnItemSelectedListener> spinners = new HashMap<>();
3330

3431
public SearchFilterDialogGenerator(final StreamingService service,
3532
final ViewGroup root,
@@ -40,24 +37,6 @@ public SearchFilterDialogGenerator(final StreamingService service,
4037
root.addView(globalLayout);
4138
}
4239

43-
@Override
44-
public void onResume() {
45-
for (final Map.Entry<Spinner, AdapterView.OnItemSelectedListener> spinner
46-
: spinners.entrySet()) {
47-
spinner.getKey().setOnItemSelectedListener(spinner.getValue());
48-
}
49-
super.onResume();
50-
}
51-
52-
@Override
53-
public void onPause() {
54-
for (final Map.Entry<Spinner, AdapterView.OnItemSelectedListener> spinner
55-
: spinners.entrySet()) {
56-
spinner.getKey().setOnItemSelectedListener(null);
57-
}
58-
super.onPause();
59-
}
60-
6140
@Override
6241
protected void createTitle(final String name,
6342
final List<View> titleViewElements) {
@@ -156,7 +135,6 @@ public void onNothingSelected(final AdapterView<?> parent) {
156135
};
157136

158137
filterDataSpinner.setOnItemSelectedListener(listener);
159-
spinners.put(filterDataSpinner, listener);
160138
}
161139

162140
private void createUiElementsForMultipleSelectableItemsFilterGroup(
@@ -175,7 +153,6 @@ private void createUiElementsForMultipleSelectableItemsFilterGroup(
175153

176154
chip.setOnClickListener(listener);
177155
chipGroup.addView(chip);
178-
viewListeners.put(chip, listener);
179156
wrapperDelegate.put(item.getIdentifier(), new UiItemWrapperChip(
180157
item, chip, chipGroup));
181158
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ private void createUiElementsForSingleSelectableItemsFilterGroup(
164164
}
165165
};
166166
view.setOnClickListener(listener);
167-
viewListeners.put(view, listener);
168167
}
169168
radioGroup.addView(view);
170169
}
@@ -191,7 +190,6 @@ private void createUiElementsForMultipleSelectableItemsFilterGroup(
191190
}
192191
};
193192
checkBox.setOnClickListener(listener);
194-
viewListeners.put(checkBox, listener);
195193

196194
view = checkBox;
197195
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,6 @@ protected ICreateUiForFiltersWorker createContentFilterWorker() {
124124
return new CreateContentFilterUI();
125125
}
126126

127-
@Override
128-
public void onResume() {
129-
// Menu does not need a implementation here
130-
}
131-
132-
@Override
133-
public void onPause() {
134-
// Menu does not need a implementation here
135-
}
136-
137127
private static class UiItemWrapper implements IUiItemWrapper {
138128

139129
private final MenuItem item;

app/src/test/java/org/schabi/newpipe/filter/SearchFilterLogicAndUiGeneratorTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -428,14 +428,6 @@ protected ICreateUiForFiltersWorker createSortFilterWorker() {
428428
protected ICreateUiForFiltersWorker createContentFilterWorker() {
429429
return null;
430430
}
431-
432-
@Override
433-
public void onResume() {
434-
}
435-
436-
@Override
437-
public void onPause() {
438-
}
439431
}
440432

441433
static class ElementsWrapper implements SearchFilterLogic.IUiItemWrapper {

0 commit comments

Comments
 (0)