From d73ca41cfe6dd3e39bf3f7d751d5870f307a336b Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 21 Jul 2022 23:44:17 +0200
Subject: [PATCH] Even when thumbnails should not be shown, set it to null in
 notification

This makes sure the thumbnail is removed from the notification if the user disables thumbnails
---
 .../player/notification/NotificationUtil.java | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/notification/NotificationUtil.java b/app/src/main/java/org/schabi/newpipe/player/notification/NotificationUtil.java
index 29ec7a981..84e9cc3bc 100644
--- a/app/src/main/java/org/schabi/newpipe/player/notification/NotificationUtil.java
+++ b/app/src/main/java/org/schabi/newpipe/player/notification/NotificationUtil.java
@@ -9,6 +9,7 @@ import android.os.Build;
 import android.util.Log;
 
 import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
@@ -137,12 +138,9 @@ public final class NotificationUtil {
         notificationBuilder.setContentTitle(player.getVideoTitle());
         notificationBuilder.setContentText(player.getUploaderName());
         notificationBuilder.setTicker(player.getVideoTitle());
+
         updateActions(notificationBuilder);
-        final boolean showThumbnail = player.getPrefs().getBoolean(
-                player.getContext().getString(R.string.show_thumbnail_key), true);
-        if (showThumbnail) {
-            setLargeIcon(notificationBuilder);
-        }
+        setLargeIcon(notificationBuilder);
     }
 
 
@@ -344,17 +342,26 @@ public final class NotificationUtil {
     /////////////////////////////////////////////////////
 
     private void setLargeIcon(final NotificationCompat.Builder builder) {
+        final boolean showThumbnail = player.getPrefs().getBoolean(
+                player.getContext().getString(R.string.show_thumbnail_key), true);
+        final Bitmap thumbnail = player.getThumbnail();
+        if (thumbnail == null || !showThumbnail) {
+            // since the builder is reused, make sure the thumbnail is unset if there is not one
+            builder.setLargeIcon(null);
+            return;
+        }
+
         final boolean scaleImageToSquareAspectRatio = player.getPrefs().getBoolean(
                 player.getContext().getString(R.string.scale_to_square_image_in_notifications_key),
                 false);
         if (scaleImageToSquareAspectRatio) {
-            builder.setLargeIcon(getBitmapWithSquareAspectRatio(player.getThumbnail()));
+            builder.setLargeIcon(getBitmapWithSquareAspectRatio(thumbnail));
         } else {
-            builder.setLargeIcon(player.getThumbnail());
+            builder.setLargeIcon(thumbnail);
         }
     }
 
-    private Bitmap getBitmapWithSquareAspectRatio(final Bitmap bitmap) {
+    private Bitmap getBitmapWithSquareAspectRatio(@NonNull final Bitmap bitmap) {
         // Find the smaller dimension and then take a center portion of the image that
         // has that size.
         final int w = bitmap.getWidth();