From cf59644a56a5c56ee961ebf14aec38a27058d22d Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Fri, 22 Jan 2021 17:20:04 -0300 Subject: [PATCH] [FIX] Wrong username on push notifications (#2825) --- .../rocket/reactnative/CustomPushNotification.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java b/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java index 23179fd6..9311f7eb 100644 --- a/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java +++ b/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java @@ -257,7 +257,6 @@ public class CustomPushNotification extends PushNotification { Notification.MessagingStyle messageStyle; Gson gson = new Gson(); - Ejson ejson = gson.fromJson(bundle.getString("ejson", "{}"), Ejson.class); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { messageStyle = new Notification.MessagingStyle(""); @@ -278,25 +277,19 @@ public class CustomPushNotification extends PushNotification { long timestamp = data.getLong("time"); String message = data.getString("message"); - String username = data.getString("username"); String senderId = data.getString("senderId"); String avatarUri = data.getString("avatarUri"); - + Ejson ejson = gson.fromJson(data.getString("ejson", "{}"), Ejson.class); String m = extractMessage(message, ejson); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { - messageStyle.addMessage(m, timestamp, username); + messageStyle.addMessage(m, timestamp, ejson.senderName); } else { Bitmap avatar = getAvatar(avatarUri); - String name = username; - if (ejson.senderName != null) { - name = ejson.senderName; - } - Person.Builder sender = new Person.Builder() .setKey(senderId) - .setName(name); + .setName(ejson.senderName); if (avatar != null) { sender.setIcon(Icon.createWithBitmap(avatar));