be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix crash when playing stream in background with shuffle in notification

This commit is contained in:
wb9688 2020-07-31 09:25:32 +02:00
parent caf7c55069
commit 6de03f2bf0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
View File

@ -351,7 +351,7 @@ public final class NotificationUtil {
} }
break; break;
case "shuffle": case "shuffle":
if (basePlayerImpl.playQueue.isShuffled()) { if (basePlayerImpl.playQueue != null && basePlayerImpl.playQueue.isShuffled()) {
builder.addAction(R.drawable.exo_controls_shuffle_on, "ShuffleOn", builder.addAction(R.drawable.exo_controls_shuffle_on, "ShuffleOn",
PendingIntent.getBroadcast(context, NOTIFICATION_ID_BACKGROUND, PendingIntent.getBroadcast(context, NOTIFICATION_ID_BACKGROUND,
new Intent(BackgroundPlayer.ACTION_SHUFFLE), new Intent(BackgroundPlayer.ACTION_SHUFFLE),
@ -601,7 +601,7 @@ public final class NotificationUtil {
} }
break; break;
case "shuffle": case "shuffle":
if (basePlayerImpl.playQueue.isShuffled()) { if (basePlayerImpl.playQueue != null && basePlayerImpl.playQueue.isShuffled()) {
notificationBuilder.mActions.set(slotNumber, notificationBuilder.mActions.set(slotNumber,
new NotificationCompat.Action(R.drawable.exo_controls_shuffle_on, new NotificationCompat.Action(R.drawable.exo_controls_shuffle_on,
"ShuffleOn", PendingIntent.getBroadcast(context, "ShuffleOn", PendingIntent.getBroadcast(context,
@ -835,7 +835,7 @@ public final class NotificationUtil {
} }
break; break;
case "shuffle": case "shuffle":
if (playerImpl.playQueue.isShuffled()) { if (playerImpl.playQueue != null && playerImpl.playQueue.isShuffled()) {
builder.addAction(R.drawable.exo_controls_shuffle_on, "ShuffleOn", builder.addAction(R.drawable.exo_controls_shuffle_on, "ShuffleOn",
PendingIntent.getBroadcast(context, NOTIFICATION_ID_POPUP, PendingIntent.getBroadcast(context, NOTIFICATION_ID_POPUP,
new Intent(PopupVideoPlayer.ACTION_SHUFFLE), new Intent(PopupVideoPlayer.ACTION_SHUFFLE),
@ -1080,7 +1080,7 @@ public final class NotificationUtil {
} }
break; break;
case "shuffle": case "shuffle":
if (playerImpl.playQueue.isShuffled()) { if (playerImpl.playQueue != null && playerImpl.playQueue.isShuffled()) {
notificationBuilder.mActions.set(slotNumber, notificationBuilder.mActions.set(slotNumber,
new NotificationCompat.Action(R.drawable.exo_controls_shuffle_on, new NotificationCompat.Action(R.drawable.exo_controls_shuffle_on,
"ShuffleOn", PendingIntent.getBroadcast(context, "ShuffleOn", PendingIntent.getBroadcast(context,