Merge pull request #4410 from Stypox/notification-fixes

Notification fixes
This commit is contained in:
Tobias Groza 2020-10-05 19:08:26 +02:00 committed by GitHub
commit 9f63e2d39a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -116,10 +116,11 @@ public final class NotificationUtil {
.setMediaSession(player.mediaSessionManager.getSessionToken()) .setMediaSession(player.mediaSessionManager.getSessionToken())
.setShowActionsInCompactView(compactSlots)) .setShowActionsInCompactView(compactSlots))
.setPriority(NotificationCompat.PRIORITY_HIGH) .setPriority(NotificationCompat.PRIORITY_HIGH)
.setSmallIcon(R.drawable.ic_newpipe_triangle_white)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setColor(ContextCompat.getColor(player.context, R.color.gray))
.setCategory(NotificationCompat.CATEGORY_TRANSPORT) .setCategory(NotificationCompat.CATEGORY_TRANSPORT)
.setShowWhen(false)
.setSmallIcon(R.drawable.ic_newpipe_triangle_white)
.setColor(ContextCompat.getColor(player.context, R.color.gray))
.setDeleteIntent(PendingIntent.getBroadcast(player.context, NOTIFICATION_ID, .setDeleteIntent(PendingIntent.getBroadcast(player.context, NOTIFICATION_ID,
new Intent(ACTION_CLOSE), FLAG_UPDATE_CURRENT)); new Intent(ACTION_CLOSE), FLAG_UPDATE_CURRENT));
@ -148,7 +149,10 @@ public final class NotificationUtil {
@SuppressLint("RestrictedApi") @SuppressLint("RestrictedApi")
boolean shouldUpdateBufferingSlot() { boolean shouldUpdateBufferingSlot() {
if (notificationBuilder.mActions.size() < 3) { if (notificationBuilder == null) {
// if there is no notification active, there is no point in updating it
return false;
} else if (notificationBuilder.mActions.size() < 3) {
// this should never happen, but let's make sure notification actions are populated // this should never happen, but let's make sure notification actions are populated
return true; return true;
} }