Skip to content

Commit fcd2d63

Browse files
committed
Don't show any channel notification thumbnail if it could not be loaded
1 parent e68d49e commit fcd2d63

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationHelper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ class NotificationHelper(val context: Context) {
8484
)
8585
)
8686

87-
PicassoHelper.loadNotificationIcon(data.avatarUrl, context) { bitmap ->
88-
builder.setLargeIcon(bitmap)
87+
PicassoHelper.loadNotificationIcon(data.avatarUrl) { bitmap ->
88+
bitmap?.let { builder.setLargeIcon(it) } // set only if != null
8989
manager.notify(data.pseudoId, builder.build())
9090
}
9191
}

app/src/main/java/org/schabi/newpipe/util/PicassoHelper.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.annotation.SuppressLint;
66
import android.content.Context;
77
import android.graphics.Bitmap;
8-
import android.graphics.BitmapFactory;
98
import android.graphics.drawable.Drawable;
109

1110
import com.squareup.picasso.Cache;
@@ -165,7 +164,6 @@ public String key() {
165164

166165

167166
public static void loadNotificationIcon(final String url,
168-
final Context context,
169167
final Consumer<Bitmap> bitmapConsumer) {
170168
loadImageDefault(url, R.drawable.ic_newpipe_triangle_white)
171169
.into(new Target() {
@@ -176,8 +174,7 @@ public void onBitmapLoaded(final Bitmap bitmap, final Picasso.LoadedFrom from) {
176174

177175
@Override
178176
public void onBitmapFailed(final Exception e, final Drawable errorDrawable) {
179-
bitmapConsumer.accept(BitmapFactory.decodeResource(context.getResources(),
180-
R.drawable.ic_newpipe_triangle_white));
177+
bitmapConsumer.accept(null);
181178
}
182179

183180
@Override

0 commit comments

Comments
 (0)