Fix PlaylistAppendDialog: Renamed method and replaced with Runnable

TeamNewPipe · Sep 29, 2020 · d93e263 · d93e263
1 parent 6a7a83c
commit d93e263
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -478,7 +478,7 @@ public void onClick(final View v) {
 
                     final PlaylistAppendDialog d = PlaylistAppendDialog.fromStreamInfo(currentInfo);
                     disposables.add(
-                        PlaylistAppendDialog.checkPlaylists(getContext(),
+                        PlaylistAppendDialog.onPlaylistFound(getContext(),
                             () -> d.show(getFM(), TAG),
                             () -> PlaylistCreationDialog.newInstance(d).show(getFM(), TAG)
                         )

diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
@@ -40,8 +40,8 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
 
     private CompositeDisposable playlistDisposables = new CompositeDisposable();
 
-    public static Disposable checkPlaylists(
-            final Context context, final Invoker onSuccess, final Invoker onFailed
+    public static Disposable onPlaylistFound(
+            final Context context, final Runnable onSuccess, final Runnable onFailed
     ) {
         final LocalPlaylistManager playlistManager =
                 new LocalPlaylistManager(NewPipeDatabase.getInstance(context));
@@ -50,17 +50,13 @@ public static Disposable checkPlaylists(
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(hasPlaylists -> {
                     if (hasPlaylists) {
-                        onSuccess.invoke();
+                        onSuccess.run();
                     } else {
-                        onFailed.invoke();
+                        onFailed.run();
                     }
                 });
     }
 
-    public interface Invoker {
-        void invoke();
-    }
-
     public static PlaylistAppendDialog fromStreamInfo(final StreamInfo info) {
         final PlaylistAppendDialog dialog = new PlaylistAppendDialog();
         dialog.setInfo(Collections.singletonList(new StreamEntity(info)));

diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -574,7 +574,7 @@ private void appendAllToPlaylist() {
     private void openPlaylistAppendDialog(final List<PlayQueueItem> playlist) {
         final PlaylistAppendDialog d = PlaylistAppendDialog.fromPlayQueueItems(playlist);
 
-        PlaylistAppendDialog.checkPlaylists(getApplicationContext(),
+        PlaylistAppendDialog.onPlaylistFound(getApplicationContext(),
             () -> d.show(getSupportFragmentManager(), getTag()),
             () -> PlaylistCreationDialog.newInstance(d)
                     .show(getSupportFragmentManager(), getTag()

diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
@@ -44,7 +44,7 @@ public enum StreamDialogEntry {
             final PlaylistAppendDialog d = PlaylistAppendDialog
                     .fromStreamInfoItems(Collections.singletonList(item));
 
-            PlaylistAppendDialog.checkPlaylists(fragment.getContext(),
+            PlaylistAppendDialog.onPlaylistFound(fragment.getContext(),
                 () -> d.show(fragment.getFragmentManager(), "StreamDialogEntry@append_playlist"),
                 () -> PlaylistCreationDialog.newInstance(d)
                         .show(fragment.getFragmentManager(), "StreamDialogEntry@create_playlist")