fix: handle null message in CustomPushNotification to prevent crashes (#6678)

diegolmello · web-flow · commit b76942de3876 · 2025-09-26T13:56:19.000-03:00
diff --git a/android/app/src/main/java/chat/rocket/reactnative/notification/CustomPushNotification.java b/android/app/src/main/java/chat/rocket/reactnative/notification/CustomPushNotification.java
@@ -241,6 +241,9 @@ private void notificationChannel(Notification.Builder notification) {
     }
 
     private String extractMessage(String message, Ejson ejson) {
+        if (message == null) {
+            return "";
+        }
         if (ejson != null && ejson.type != null && !ejson.type.equals("d")) {
             int pos = message.indexOf(":");
             int start = pos == -1 ? 0 : pos + 2;

Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,9 @@ private void notificationChannel(Notification.Builder notification) {`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`private String extractMessage(String message, Ejson ejson) {`
	`244`	`+ if (message == null) {`
	`245`	`+ return "";`
	`246`	`+ }`
`244`	`247`	`if (ejson != null && ejson.type != null && !ejson.type.equals("d")) {`
`245`	`248`	`int pos = message.indexOf(":");`
`246`	`249`	`int start = pos == -1 ? 0 : pos + 2;`