From bb9f96f409becdf0c3ccf8579e258d5881da9125 Mon Sep 17 00:00:00 2001
From: Miguel Alatzar <migbot@users.noreply.github.com>
Date: Wed, 3 Apr 2019 18:39:28 -0700
Subject: [PATCH] [MM-14871] Fix extraction of sender name for push
 notifications (#2691)

* Return empty string for sender name when not found
---
 .../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 90c691f8b..b53c6afdd 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
@@ -363,7 +363,12 @@ public class CustomPushNotification extends PushNotification {
             return channelName;
         }
 
-        return message.split(":")[0];
+        String senderName = message.split(":")[0];
+        if (senderName != message) {
+            return senderName;
+        }
+
+        return " ";
     }
 
     private String removeSenderFromMessage(String message) {