Skip to content

Commit 638f227

Browse files
committed
Use newInstance in PlaylistDialog
1 parent 629b685 commit 638f227

3 files changed

Lines changed: 29 additions & 11 deletions

File tree

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,16 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
3333

3434
private final CompositeDisposable playlistDisposables = new CompositeDisposable();
3535

36-
public PlaylistAppendDialog(final List<StreamEntity> streamEntities) {
37-
super(streamEntities);
36+
/**
37+
* Create a new instance of {@link PlaylistAppendDialog}.
38+
*
39+
* @param streamEntities a list of {@link StreamEntity} to be added to playlists
40+
* @return a new instance of {@link PlaylistAppendDialog}
41+
*/
42+
public static PlaylistAppendDialog newInstance(final List<StreamEntity> streamEntities) {
43+
final PlaylistAppendDialog dialog = new PlaylistAppendDialog();
44+
dialog.setStreamEntities(streamEntities);
45+
return dialog;
3846
}
3947

4048
/*//////////////////////////////////////////////////////////////////////////
@@ -103,13 +111,14 @@ public void onDestroyView() {
103111
// Helper
104112
//////////////////////////////////////////////////////////////////////////*/
105113

114+
/** Display create playlist dialog. */
106115
public void openCreatePlaylistDialog() {
107116
if (getStreamEntities() == null || !isAdded()) {
108117
return;
109118
}
110119

111120
final PlaylistCreationDialog playlistCreationDialog =
112-
new PlaylistCreationDialog(getStreamEntities());
121+
PlaylistCreationDialog.newInstance(getStreamEntities());
113122
// Move the dismissListener to the new dialog.
114123
playlistCreationDialog.setOnDismissListener(this.getOnDismissListener());
115124
this.setOnDismissListener(null);

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,17 @@
2121
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
2222

2323
public final class PlaylistCreationDialog extends PlaylistDialog {
24-
public PlaylistCreationDialog(final List<StreamEntity> streamEntities) {
25-
super(streamEntities);
24+
25+
/**
26+
* Create a new instance of {@link PlaylistCreationDialog}.
27+
*
28+
* @param streamEntities a list of {@link StreamEntity} to be added to playlists
29+
* @return a new instance of {@link PlaylistCreationDialog}
30+
*/
31+
public static PlaylistCreationDialog newInstance(final List<StreamEntity> streamEntities) {
32+
final PlaylistCreationDialog dialog = new PlaylistCreationDialog();
33+
dialog.setStreamEntities(streamEntities);
34+
return dialog;
2635
}
2736

2837
/*//////////////////////////////////////////////////////////////////////////

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
3131

3232
private org.schabi.newpipe.util.SavedState savedState;
3333

34-
public PlaylistDialog(final List<StreamEntity> streamEntities) {
35-
this.streamEntities = streamEntities;
36-
}
37-
3834
/*//////////////////////////////////////////////////////////////////////////
3935
// LifeCycle
4036
//////////////////////////////////////////////////////////////////////////*/
@@ -120,6 +116,10 @@ public void setOnDismissListener(
120116
this.onDismissListener = onDismissListener;
121117
}
122118

119+
protected void setStreamEntities(final List<StreamEntity> streamEntities) {
120+
this.streamEntities = streamEntities;
121+
}
122+
123123
/*//////////////////////////////////////////////////////////////////////////
124124
// Dialog creation
125125
//////////////////////////////////////////////////////////////////////////*/
@@ -143,8 +143,8 @@ public static Disposable createCorrespondingDialog(
143143
.observeOn(AndroidSchedulers.mainThread())
144144
.subscribe(hasPlaylists ->
145145
onExec.accept(hasPlaylists
146-
? new PlaylistAppendDialog(streamEntities)
147-
: new PlaylistCreationDialog(streamEntities))
146+
? PlaylistAppendDialog.newInstance(streamEntities)
147+
: PlaylistCreationDialog.newInstance(streamEntities))
148148
);
149149
}
150150
}

0 commit comments

Comments
 (0)