From 5958dc992beb975506f51d40cc620deb983a25fe Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Mon, 23 Mar 2020 18:43:04 -0300 Subject: [PATCH] [FIX] Check if avatar exists before create Icon --- .../reactnative/CustomPushNotification.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/chat/rocket/reactnative/CustomPushNotification.java b/android/app/src/main/java/chat/rocket/reactnative/CustomPushNotification.java index dd202268724..17002faa0b4 100644 --- a/android/app/src/main/java/chat/rocket/reactnative/CustomPushNotification.java +++ b/android/app/src/main/java/chat/rocket/reactnative/CustomPushNotification.java @@ -237,12 +237,19 @@ private void notificationStyle(Notification.Builder notification, int notId, Bun if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { messageStyle.addMessage(m, timestamp, username); } else { - Person sender = new Person.Builder() + Bitmap avatar = getAvatar(avatarUri); + + Person.Builder sender = new Person.Builder() .setKey(senderId) - .setName(username) - .setIcon(Icon.createWithBitmap(getAvatar(avatarUri))) - .build(); - messageStyle.addMessage(m, timestamp, sender); + .setName(username); + + if (avatar != null) { + sender.setIcon(Icon.createWithBitmap(avatar)); + } + + Person person = sender.build(); + + messageStyle.addMessage(m, timestamp, person); } } }