Skip to content

Commit be4d127

Browse files
committed
Fix random NullPointerException in SearchFragment
1 parent 9f59d4b commit be4d127

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
139139
@State
140140
boolean wasSearchFocused = false;
141141

142-
private Map<Integer, String> menuItemToFilterName;
142+
@Nullable private Map<Integer, String> menuItemToFilterName = null;
143143
private StreamingService service;
144144
private Page nextPage;
145145
private boolean isSuggestionsEnabled = true;
@@ -455,11 +455,12 @@ public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
455455
}
456456

457457
@Override
458-
public boolean onOptionsItemSelected(final MenuItem item) {
459-
final List<String> cf = new ArrayList<>(1);
460-
cf.add(menuItemToFilterName.get(item.getItemId()));
461-
changeContentFilter(item, cf);
462-
458+
public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
459+
if (menuItemToFilterName != null) {
460+
final List<String> cf = new ArrayList<>(1);
461+
cf.add(menuItemToFilterName.get(item.getItemId()));
462+
changeContentFilter(item, cf);
463+
}
463464
return true;
464465
}
465466

0 commit comments

Comments
 (0)