From 9d5d89d6483a296bee5b4a5c5cb6099e63a6264a Mon Sep 17 00:00:00 2001 From: SinTan1729 Date: Mon, 6 Oct 2025 21:58:41 -0500 Subject: [PATCH] new: Separate toast for when all songs were skipped Also, fixed grammatical issue in toast where they were all singular. --- .../tempo/repository/PlaylistRepository.java | 30 +++++++++++-------- app/src/main/res/values/strings.xml | 5 ++-- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java b/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java index 9a8369a1..f87cd577 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java +++ b/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java @@ -81,20 +81,24 @@ public class PlaylistRepository { } public void addSongToPlaylist(String playlistId, ArrayList songsId) { - App.getSubsonicClientInstance(false) - .getPlaylistClient() - .updatePlaylist(playlistId, null, true, songsId, null) - .enqueue(new Callback() { - @Override - public void onResponse(@NonNull Call call, @NonNull Response response) { - Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_add_success), Toast.LENGTH_SHORT).show(); - } + if (songsId.isEmpty()) { + Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_all_skipped), Toast.LENGTH_SHORT).show(); + } else{ + App.getSubsonicClientInstance(false) + .getPlaylistClient() + .updatePlaylist(playlistId, null, true, songsId, null) + .enqueue(new Callback() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response response) { + Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_add_success), Toast.LENGTH_SHORT).show(); + } - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { - Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_add_failure), Toast.LENGTH_SHORT).show(); - } - }); + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_add_failure), Toast.LENGTH_SHORT).show(); + } + }); + } } public void createPlaylist(String playlistId, String name, ArrayList songsId) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index eb8abbc4..48ad3cd7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -207,8 +207,9 @@ Cancel Create Add to a playlist - Added song to playlist - Failed to add song to playlist + Added song(s) to playlist + Failed to add song(s) to playlist + All songs were skipped as duplicates %1$d tracks • %2$s Duration • %1$s Long press to delete