Skip to content

Commit 5fb7b32

Browse files
Jared234Stypox
authored andcommitted
Removed the duplicate dialog and added another toast option
1 parent 8b6e110 commit 5fb7b32

2 files changed

Lines changed: 8 additions & 33 deletions

File tree

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

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.schabi.newpipe.local.dialog;
22

3-
import android.app.AlertDialog;
43
import android.os.Bundle;
54
import android.view.LayoutInflater;
65
import android.view.View;
@@ -177,20 +176,15 @@ private void onPlaylistSelected(@NonNull final LocalPlaylistManager manager,
177176
@NonNull final PlaylistMetadataEntry playlist,
178177
@NonNull final List<StreamEntity> streams) {
179178

180-
final int numberOfDuplicates = manager.getPlaylistDuplicateCount(playlist.uid,
181-
streams.get(0).getUrl()).blockingFirst();
182-
if (numberOfDuplicates > 0) {
183-
createDuplicateDialog(numberOfDuplicates, manager, playlist, streams);
184-
} else {
185-
addStreamToPlaylist(manager, playlist, streams);
179+
final int numOfDuplicates = manager.getPlaylistDuplicateCount(playlist.uid,
180+
streams.get(0).getUrl()).blockingFirst();
181+
String toastText = getString(R.string.playlist_add_stream_success);
182+
183+
if (numOfDuplicates > 0) {
184+
toastText = getString(R.string.playlist_add_stream_success_duplicate);
186185
}
187-
}
188186

189-
private void addStreamToPlaylist(@NonNull final LocalPlaylistManager manager,
190-
@NonNull final PlaylistMetadataEntry playlist,
191-
@NonNull final List<StreamEntity> streams) {
192-
final Toast successToast = Toast.makeText(getContext(),
193-
R.string.playlist_add_stream_success, Toast.LENGTH_SHORT);
187+
final Toast successToast = Toast.makeText(getContext(), toastText, Toast.LENGTH_SHORT);
194188

195189
if (playlist.thumbnailUrl
196190
.equals("drawable://" + R.drawable.placeholder_thumbnail_playlist)) {
@@ -206,21 +200,4 @@ private void addStreamToPlaylist(@NonNull final LocalPlaylistManager manager,
206200

207201
requireDialog().dismiss();
208202
}
209-
210-
private void createDuplicateDialog(final int numberOfDuplicates,
211-
@NonNull final LocalPlaylistManager manager,
212-
@NonNull final PlaylistMetadataEntry playlist,
213-
@NonNull final List<StreamEntity> streams) {
214-
final AlertDialog.Builder builder = new AlertDialog.Builder(this.getActivity());
215-
builder.setTitle(R.string.duplicate_stream_in_playlist_title);
216-
builder.setMessage(getString(R.string.duplicate_stream_in_playlist_description,
217-
numberOfDuplicates));
218-
219-
builder.setPositiveButton(android.R.string.yes, (dialog, i) -> {
220-
addStreamToPlaylist(manager, playlist, streams);
221-
});
222-
builder.setNeutralButton(R.string.cancel, null);
223-
224-
builder.create().show();
225-
}
226203
}

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,11 +446,9 @@
446446
<string name="delete_playlist_prompt">Delete this playlist\?</string>
447447
<string name="playlist_creation_success">Playlist created</string>
448448
<string name="playlist_add_stream_success">Playlisted</string>
449+
<string name="playlist_add_stream_success_duplicate">Playlisted duplicate</string>
449450
<string name="playlist_thumbnail_change_success">Playlist thumbnail changed.</string>
450451
<string name="playlist_no_uploader">Auto-generated (no uploader found)</string>
451-
<string name="duplicate_stream_in_playlist_title">Duplicated Video Found</string>
452-
<string name="duplicate_stream_in_playlist_description">The playlist contains this stream
453-
already %d time(s).\nDo you want to add it one more time?</string>
454452
<!-- Players -->
455453
<string name="caption_none">No Captions</string>
456454
<string name="resize_fit">Fit</string>

0 commit comments

Comments
 (0)