From bd1aae8d66d68ca511740a7b3765b513354c4e6e Mon Sep 17 00:00:00 2001
From: GGAutomaton <32899400+GGAutomaton@users.noreply.github.com>
Date: Sat, 16 Apr 2022 12:44:24 +0800
Subject: [PATCH] Fix sonar warning

---
 .../newpipe/local/bookmark/BookmarkFragment.java | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
index 14100ef81..b19107817 100644
--- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
@@ -446,12 +446,10 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
                 final Long databaseIndex = displayIndexInDatabase.remove(key);
 
                 // The database index should not be null because inserting new item into database
-                // is not dealt here. NullPointerException has occurred once, but I can't reproduce
-                // it. Enhance robustness here.
-                if (databaseIndex != null) {
-                    if (databaseIndex != i) {
-                        localItemsUpdate.add((PlaylistMetadataEntry) item);
-                    }
+                // is not handled here. NullPointerException has occurred once, but I can't
+                // reproduce it. Enhance robustness here.
+                if (databaseIndex != null && databaseIndex != i) {
+                    localItemsUpdate.add((PlaylistMetadataEntry) item);
                 }
             } else if (item instanceof PlaylistRemoteEntity) {
                 ((PlaylistRemoteEntity) item).setDisplayIndex(i);
@@ -461,10 +459,8 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
                         LocalItem.LocalItemType.PLAYLIST_REMOTE_ITEM);
                 final Long databaseIndex = displayIndexInDatabase.remove(key);
 
-                if (databaseIndex != null) {
-                    if (databaseIndex != i) {
-                        remoteItemsUpdate.add((PlaylistRemoteEntity) item);
-                    }
+                if (databaseIndex != null && databaseIndex != i) {
+                    remoteItemsUpdate.add((PlaylistRemoteEntity) item);
                 }
             }
         }