Skip to content

Commit c537776

Browse files
committed
- Crash fix on clicking on add to playlist. - Added toast when clicked on share button for better UI.
1 parent 4a27d37 commit c537776

2 files changed

Lines changed: 19 additions & 9 deletions

File tree

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import android.view.MenuItem;
1414
import android.view.View;
1515
import android.view.ViewGroup;
16+
import android.widget.Toast;
1617

1718
import androidx.annotation.NonNull;
1819
import androidx.annotation.Nullable;
@@ -233,21 +234,29 @@ public boolean onOptionsItemSelected(final MenuItem item) {
233234
if (currentInfo != null) {
234235
ShareUtils.shareText(requireContext(), name, url,
235236
currentInfo.getThumbnailUrl());
237+
} else {
238+
Toast.makeText(getContext(), getString(R.string.playlist_loading_message),
239+
Toast.LENGTH_SHORT).show();
236240
}
237241
break;
238242
case R.id.menu_item_bookmark:
239243
onBookmarkClicked();
240244
break;
241245
case R.id.menu_item_append_playlist:
242-
disposables.add(PlaylistDialog.createCorrespondingDialog(
243-
getContext(),
244-
getPlayQueue()
245-
.getStreams()
246-
.stream()
247-
.map(StreamEntity::new)
248-
.collect(Collectors.toList()),
249-
dialog -> dialog.show(getFM(), TAG)
250-
));
246+
if (currentInfo != null) {
247+
disposables.add(PlaylistDialog.createCorrespondingDialog(
248+
getContext(),
249+
getPlayQueue()
250+
.getStreams()
251+
.stream()
252+
.map(StreamEntity::new)
253+
.collect(Collectors.toList()),
254+
dialog -> dialog.show(getFM(), TAG)
255+
));
256+
} else {
257+
Toast.makeText(getContext(), getString(R.string.playlist_loading_message),
258+
Toast.LENGTH_SHORT).show();
259+
}
251260
break;
252261
default:
253262
return super.onOptionsItemSelected(item);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@
241241
<string name="restore_defaults">Restore defaults</string>
242242
<string name="restore_defaults_confirmation">Do you want to restore defaults?</string>
243243
<string name="permission_display_over_apps">Give permission to display over other apps</string>
244+
<string name="playlist_loading_message">Playlist loading…</string>
244245
<!-- error activity -->
245246
<string name="error_report_notification_title">NewPipe encountered an error, tap to report</string>
246247
<string name="error_report_notification_toast">An error occurred, see the notification</string>

0 commit comments

Comments
 (0)