From 1ac62541a8b601c15816065ba5d4a2b8702afa8b Mon Sep 17 00:00:00 2001
From: Jared Fantaye <Jared@fantaye.de>
Date: Fri, 9 Dec 2022 12:01:59 +0100
Subject: [PATCH] Formatting, renaming and small fixes

---
 .../playlist/model/PlaylistEntity.java         | 18 +++++++++---------
 .../local/bookmark/BookmarkFragment.java       | 16 +++++++---------
 .../local/playlist/LocalPlaylistFragment.java  | 13 +++++++------
 .../local/playlist/LocalPlaylistManager.java   |  7 ++++---
 app/src/main/res/values/strings.xml            |  1 -
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java
index a04a284da..051b7c318 100644
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java
@@ -15,7 +15,7 @@ public class PlaylistEntity {
     public static final String PLAYLIST_ID = "uid";
     public static final String PLAYLIST_NAME = "name";
     public static final String PLAYLIST_THUMBNAIL_URL = "thumbnail_url";
-    public static final String PLAYLIST_THUMBNAIL_SET = "isThumbnailSet";
+    public static final String PLAYLIST_THUMBNAIL_PERMANENT = "isThumbnailSet";
 
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = PLAYLIST_ID)
@@ -27,14 +27,14 @@ public class PlaylistEntity {
     @ColumnInfo(name = PLAYLIST_THUMBNAIL_URL)
     private String thumbnailUrl;
 
-    @ColumnInfo(name = PLAYLIST_THUMBNAIL_SET)
-    private boolean isThumbnailSet;
+    @ColumnInfo(name = PLAYLIST_THUMBNAIL_PERMANENT)
+    private boolean isThumbnailPermanent;
 
     public PlaylistEntity(final String name, final String thumbnailUrl,
-                          final boolean isThumbnailSet) {
+                          final boolean isThumbnailPermanent) {
         this.name = name;
         this.thumbnailUrl = thumbnailUrl;
-        this.isThumbnailSet = isThumbnailSet;
+        this.isThumbnailPermanent = isThumbnailPermanent;
     }
 
     public long getUid() {
@@ -61,12 +61,12 @@ public class PlaylistEntity {
         this.thumbnailUrl = thumbnailUrl;
     }
 
-    public boolean getIsThumbnailSet() {
-        return isThumbnailSet;
+    public boolean getIsThumbnailPermanent() {
+        return isThumbnailPermanent;
     }
 
-    public void setIsThumbnailSet(final boolean isThumbnailSet) {
-        this.isThumbnailSet = isThumbnailSet;
+    public void setIsThumbnailPermanent(final boolean isThumbnailSet) {
+        this.isThumbnailPermanent = isThumbnailSet;
     }
 
 }
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 1ef61bf31..8cb544e0b 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
@@ -262,12 +262,12 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
         final String rename = getString(R.string.rename);
         final String delete = getString(R.string.delete);
         final String unsetThumbnail = getString(R.string.unset_playlist_thumbnail);
-        final boolean isPlaylistThumbnailSet = localPlaylistManager
-                .getIsPlaylistThumbnailSet(selectedItem.uid);
+        final boolean isThumbnailPermanent = localPlaylistManager
+                .getIsPlaylistThumbnailPermanent(selectedItem.uid);
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 
-        final ArrayAdapter<String> arrayAdapter = getLocalDialogArrayAdapter(isPlaylistThumbnailSet,
+        final ArrayAdapter<String> arrayAdapter = getLocalDialogArrayAdapter(isThumbnailPermanent,
                 unsetThumbnail);
         arrayAdapter.addAll(rename, delete, unsetThumbnail);
 
@@ -277,11 +277,10 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
             } else if (index == arrayAdapter.getPosition(delete)) {
                 showDeleteDialog(selectedItem.name, localPlaylistManager
                         .deletePlaylist(selectedItem.uid));
-                dialog.dismiss();
-            } else if (isPlaylistThumbnailSet) {
-                final String thumbnail_url = localPlaylistManager
+            } else if (isThumbnailPermanent) {
+                final String thumbnailUrl = localPlaylistManager
                         .getAutomaticPlaylistThumbnail(selectedItem.uid);
-                localPlaylistManager.changePlaylistThumbnail(selectedItem.uid, thumbnail_url, false)
+                localPlaylistManager.changePlaylistThumbnail(selectedItem.uid, thumbnailUrl, false)
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe();
             }
@@ -294,8 +293,7 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
 
     private ArrayAdapter<String> getLocalDialogArrayAdapter(final boolean isPlaylistThumbnailSet,
                                                             final String unsetThumbnail) {
-        return new ArrayAdapter<>(getContext(),
-                android.R.layout.simple_list_item_1) {
+        return new ArrayAdapter<>(getContext(), android.R.layout.simple_list_item_1) {
             @Override
             public View getView(final int position, final View convertView,
                                 final ViewGroup parent) {
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index 78e455c78..d584ceefb 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -405,8 +405,8 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                 .zipWith(historyIdsMaybe, (playlist, historyStreamIds) -> {
                     // Remove Watched, Functionality data
                     final List<PlaylistStreamEntry> notWatchedItems = new ArrayList<>();
-                    final boolean isThumbnailSet = playlistManager
-                            .getIsPlaylistThumbnailSet(playlistId);
+                    final boolean isThumbnailPermanent = playlistManager
+                            .getIsPlaylistThumbnailPermanent(playlistId);
                     boolean thumbnailVideoRemoved = false;
 
                     if (removePartiallyWatched) {
@@ -416,7 +416,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
 
                             if (indexInHistory < 0) {
                                 notWatchedItems.add(playlistItem);
-                            } else if (!isThumbnailSet && !thumbnailVideoRemoved
+                            } else if (!isThumbnailPermanent && !thumbnailVideoRemoved
                                     && playlistManager.getPlaylistThumbnail(playlistId)
                                     .equals(playlistItem.getStreamEntity().getThumbnailUrl())) {
                                 thumbnailVideoRemoved = true;
@@ -437,7 +437,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                             if (indexInHistory < 0 || (streamStateEntity != null
                                     && !streamStateEntity.isFinished(duration))) {
                                 notWatchedItems.add(playlistItem);
-                            } else if (!isThumbnailSet && !thumbnailVideoRemoved
+                            } else if (!isThumbnailPermanent && !thumbnailVideoRemoved
                                     && playlistManager.getPlaylistThumbnail(playlistId)
                                     .equals(playlistItem.getStreamEntity().getThumbnailUrl())) {
                                 thumbnailVideoRemoved = true;
@@ -589,7 +589,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
 
     private void changeThumbnailUrl(final String thumbnailUrl, final boolean isPermanent) {
         if (playlistManager == null || (!isPermanent && playlistManager
-                .getIsPlaylistThumbnailSet(playlistId))) {
+                .getIsPlaylistThumbnailPermanent(playlistId))) {
             return;
         }
 
@@ -612,11 +612,12 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     }
 
     private void updateThumbnailUrl() {
-        if (playlistManager.getIsPlaylistThumbnailSet(playlistId)) {
+        if (playlistManager.getIsPlaylistThumbnailPermanent(playlistId)) {
             return;
         }
 
         final String newThumbnailUrl;
+
         if (!itemListAdapter.getItemsList().isEmpty()) {
             newThumbnailUrl = ((PlaylistStreamEntry) itemListAdapter.getItemsList().get(0))
                     .getStreamEntity().getThumbnailUrl();
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistManager.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistManager.java
index 8d975241b..4007d0e09 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistManager.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistManager.java
@@ -110,8 +110,9 @@ public class LocalPlaylistManager {
         return playlistTable.getPlaylist(playlistId).blockingFirst().get(0).getThumbnailUrl();
     }
 
-    public boolean getIsPlaylistThumbnailSet(final long playlistId) {
-        return playlistTable.getPlaylist(playlistId).blockingFirst().get(0).getIsThumbnailSet();
+    public boolean getIsPlaylistThumbnailPermanent(final long playlistId) {
+        return playlistTable.getPlaylist(playlistId).blockingFirst().get(0)
+                .getIsThumbnailPermanent();
     }
 
     public String getAutomaticPlaylistThumbnail(final long playlistId) {
@@ -133,7 +134,7 @@ public class LocalPlaylistManager {
                     }
                     if (thumbnailUrl != null) {
                         playlist.setThumbnailUrl(thumbnailUrl);
-                        playlist.setIsThumbnailSet(isPermanent);
+                        playlist.setIsThumbnailPermanent(isPermanent);
                     }
                     return playlistTable.update(playlist);
                 }).subscribeOn(Schedulers.io());
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b79bb2815..85f82e60c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,7 +7,6 @@
     <string name="install">Install</string>
     <string name="cancel">Cancel</string>
     <string name="ok">OK</string>
-    <string name="yes">Yes</string>
     <string name="open_in_browser">Open in browser</string>
     <string name="mark_as_watched">Mark as watched</string>
     <string name="open_in_popup_mode">Open in popup mode</string>