From 705d13c3ef0ea4e718144b4252a1b0eee3e5f591 Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Fri, 6 Aug 2021 15:17:19 +0200 Subject: [PATCH] MM-37674 Fix android push notification crash (#5601) (#5606) (cherry picked from commit fdf93ae0c5d953b92ae6627ad553dd283bc54b52) Co-authored-by: Elias Nahum --- .../rnbeta/CustomPushNotificationHelper.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotificationHelper.java b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotificationHelper.java index 268ed2716..956322935 100644 --- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotificationHelper.java +++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotificationHelper.java @@ -80,7 +80,10 @@ public class CustomPushNotificationHelper { .setName(senderName); try { - sender.setIcon(IconCompat.createWithBitmap(Objects.requireNonNull(userAvatar(context, senderId)))); + Bitmap avatar = userAvatar(context, senderId); + if (avatar != null) { + sender.setIcon(IconCompat.createWithBitmap(avatar)); + } } catch (IOException e) { e.printStackTrace(); } @@ -242,7 +245,10 @@ public class CustomPushNotificationHelper { .setName("Me"); try { - sender.setIcon(IconCompat.createWithBitmap(Objects.requireNonNull(userAvatar(context, "me")))); + Bitmap avatar = userAvatar(context, "me"); + if (avatar != null) { + sender.setIcon(IconCompat.createWithBitmap(avatar)); + } } catch (IOException e) { e.printStackTrace(); } @@ -393,7 +399,10 @@ public class CustomPushNotificationHelper { if (channelName.equals(senderName)) { try { String senderId = bundle.getString("sender_id"); - notification.setLargeIcon(userAvatar(context, senderId)); + Bitmap avatar = userAvatar(context, senderId); + if (avatar != null) { + notification.setLargeIcon(avatar); + } } catch (IOException e) { e.printStackTrace(); }