From c3ce1c1f0d2a9d7d91c03e47e5e360c376de4785 Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Thu, 27 Aug 2020 12:43:42 -0400 Subject: [PATCH] Use substring over replaceFirst (#4707) (#4737) (cherry picked from commit 68457c5e7e8e37be2edf7eaffc8a51ec334991ce) Co-authored-by: Miguel Alatzar --- .../java/com/mattermost/rnbeta/CustomPushNotification.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java index b497688f8..a37b8f59d 100644 --- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java +++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java @@ -532,7 +532,12 @@ public class CustomPushNotification extends PushNotification { } private String removeSenderNameFromMessage(String message, String senderName) { - return message.replaceFirst(senderName, "").replaceFirst(": ", "").trim(); + Integer index = message.indexOf(senderName); + if (index == 0) { + message = message.substring(senderName.length()); + } + + return message.replaceFirst(": ", "").trim(); } private void notificationReceiptDelivery(String ackId, String postId, String type, boolean isIdLoaded, ResolvePromise promise) {