mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 08:30:44 +00:00
Merge pull request #5944 from Stypox/fix-search-menu
Fix some random NullPointerExceptions
This commit is contained in:
commit
43f85408be
@ -423,8 +423,10 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
|
|||||||
@Override
|
@Override
|
||||||
public void setTitle(final String title) {
|
public void setTitle(final String title) {
|
||||||
super.setTitle(title);
|
super.setTitle(title);
|
||||||
|
if (headerBinding != null) {
|
||||||
headerBinding.playlistTitleView.setText(title);
|
headerBinding.playlistTitleView.setText(title);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void onBookmarkClicked() {
|
private void onBookmarkClicked() {
|
||||||
if (isBookmarkButtonReady == null || !isBookmarkButtonReady.get()
|
if (isBookmarkButtonReady == null || !isBookmarkButtonReady.get()
|
||||||
|
@ -139,7 +139,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
|
|||||||
@State
|
@State
|
||||||
boolean wasSearchFocused = false;
|
boolean wasSearchFocused = false;
|
||||||
|
|
||||||
private Map<Integer, String> menuItemToFilterName;
|
@Nullable private Map<Integer, String> menuItemToFilterName = null;
|
||||||
private StreamingService service;
|
private StreamingService service;
|
||||||
private Page nextPage;
|
private Page nextPage;
|
||||||
private boolean isSuggestionsEnabled = true;
|
private boolean isSuggestionsEnabled = true;
|
||||||
@ -455,11 +455,12 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(final MenuItem item) {
|
public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
|
||||||
|
if (menuItemToFilterName != null) {
|
||||||
final List<String> cf = new ArrayList<>(1);
|
final List<String> cf = new ArrayList<>(1);
|
||||||
cf.add(menuItemToFilterName.get(item.getItemId()));
|
cf.add(menuItemToFilterName.get(item.getItemId()));
|
||||||
changeContentFilter(item, cf);
|
changeContentFilter(item, cf);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@ import android.widget.TextView;
|
|||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
import androidx.appcompat.app.AlertDialog;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
import androidx.appcompat.content.res.AppCompatResources;
|
import androidx.appcompat.content.res.AppCompatResources;
|
||||||
import androidx.core.graphics.drawable.DrawableCompat;
|
import androidx.core.graphics.drawable.DrawableCompat;
|
||||||
@ -41,9 +42,8 @@ public class NotificationActionsPreference extends Preference {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private NotificationSlot[] notificationSlots;
|
@Nullable private NotificationSlot[] notificationSlots = null;
|
||||||
|
@Nullable private List<Integer> compactSlots = null;
|
||||||
private List<Integer> compactSlots;
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
// Lifecycle
|
// Lifecycle
|
||||||
@ -85,10 +85,12 @@ public class NotificationActionsPreference extends Preference {
|
|||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
private void saveChanges() {
|
private void saveChanges() {
|
||||||
|
if (compactSlots != null && notificationSlots != null) {
|
||||||
final SharedPreferences.Editor editor = getSharedPreferences().edit();
|
final SharedPreferences.Editor editor = getSharedPreferences().edit();
|
||||||
|
|
||||||
for (int i = 0; i < 3; i++) {
|
for (int i = 0; i < 3; i++) {
|
||||||
editor.putInt(getContext().getString(NotificationConstants.SLOT_COMPACT_PREF_KEYS[i]),
|
editor.putInt(getContext().getString(
|
||||||
|
NotificationConstants.SLOT_COMPACT_PREF_KEYS[i]),
|
||||||
(i < compactSlots.size() ? compactSlots.get(i) : -1));
|
(i < compactSlots.size() ? compactSlots.get(i) : -1));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -99,6 +101,7 @@ public class NotificationActionsPreference extends Preference {
|
|||||||
|
|
||||||
editor.apply();
|
editor.apply();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
|
Loading…
Reference in New Issue
Block a user