Merge pull request #5944 from Stypox/fix-search-menu

Fix some random NullPointerExceptions
TeamNewPipe · Mar 31, 2021 · 43f8540 · 43f8540
2 parents 5739caa + 5d6a568
commit 43f8540
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -423,7 +423,9 @@ public void onComplete() { }
     @Override
     public void setTitle(final String title) {
         super.setTitle(title);
-        headerBinding.playlistTitleView.setText(title);
+        if (headerBinding != null) {
+            headerBinding.playlistTitleView.setText(title);
+        }
     }
 
     private void onBookmarkClicked() {

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -139,7 +139,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     @State
     boolean wasSearchFocused = false;
 
-    private Map<Integer, String> menuItemToFilterName;
+    @Nullable private Map<Integer, String> menuItemToFilterName = null;
     private StreamingService service;
     private Page nextPage;
     private boolean isSuggestionsEnabled = true;
@@ -455,11 +455,12 @@ public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
-        final List<String> cf = new ArrayList<>(1);
-        cf.add(menuItemToFilterName.get(item.getItemId()));
-        changeContentFilter(item, cf);
-
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
+        if (menuItemToFilterName != null) {
+            final List<String> cf = new ArrayList<>(1);
+            cf.add(menuItemToFilterName.get(item.getItemId()));
+            changeContentFilter(item, cf);
+        }
         return true;
     }
 

diff --git a/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java b/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
@@ -17,6 +17,7 @@
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.graphics.drawable.DrawableCompat;
@@ -41,9 +42,8 @@ public NotificationActionsPreference(final Context context, final AttributeSet a
     }
 
 
-    private NotificationSlot[] notificationSlots;
-
-    private List<Integer> compactSlots;
+    @Nullable private NotificationSlot[] notificationSlots = null;
+    @Nullable private List<Integer> compactSlots = null;
 
     ////////////////////////////////////////////////////////////////////////////
     // Lifecycle
@@ -85,19 +85,22 @@ private void setupActions(@NonNull final View view) {
     ////////////////////////////////////////////////////////////////////////////
 
     private void saveChanges() {
-        final SharedPreferences.Editor editor = getSharedPreferences().edit();
+        if (compactSlots != null && notificationSlots != null) {
+            final SharedPreferences.Editor editor = getSharedPreferences().edit();
 
-        for (int i = 0; i < 3; i++) {
-            editor.putInt(getContext().getString(NotificationConstants.SLOT_COMPACT_PREF_KEYS[i]),
-                    (i < compactSlots.size() ? compactSlots.get(i) : -1));
-        }
+            for (int i = 0; i < 3; i++) {
+                editor.putInt(getContext().getString(
+                        NotificationConstants.SLOT_COMPACT_PREF_KEYS[i]),
+                        (i < compactSlots.size() ? compactSlots.get(i) : -1));
+            }
 
-        for (int i = 0; i < 5; i++) {
-            editor.putInt(getContext().getString(NotificationConstants.SLOT_PREF_KEYS[i]),
-                    notificationSlots[i].selectedAction);
-        }
+            for (int i = 0; i < 5; i++) {
+                editor.putInt(getContext().getString(NotificationConstants.SLOT_PREF_KEYS[i]),
+                        notificationSlots[i].selectedAction);
+            }
 
-        editor.apply();
+            editor.apply();
+        }
     }