feat: improve notification handling and error management

- Enhanced message parsing in CustomPushNotification to handle cases where the message format may not include a colon.
- Updated Ejson to ensure proper URL encoding for avatar paths, improving reliability in generating user and room avatars.
- Added error handling in onNotification to catch parsing errors for video conference notifications, logging warnings for failed attempts.
- Improved room name assignment logic to handle cases where sender information may be missing.
- Updated iOS ReplyNotification to provide user feedback for invalid notification data and failed replies.

Author: diegolmello

android/app/src/main/java/chat/rocket/reactnative/notification/CustomPushNotification.java

@@ -517,8 +517,11 @@ private String extractMessage(String message, Ejson ejson) {
         }
         if (ejson != null && ejson.type != null && !ejson.type.equals("d")) {
             int pos = message.indexOf(":");
-            int start = pos == -1 ? 0 : pos + 2;
-            return message.substring(start);
+            if (pos == -1) {
+                return message;
+            }
+            int start = pos + 2;
+            return start <= message.length() ? message.substring(start) : "";
         }
         return message;
     }

android/app/src/main/java/chat/rocket/reactnative/notification/Ejson.java

@@ -6,6 +6,8 @@
 import com.tencent.mmkv.MMKV;
 
 import java.math.BigInteger;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 import chat.rocket.reactnative.BuildConfig;
 import chat.rocket.reactnative.storage.MMKVKeyManager;
@@ -81,19 +83,29 @@ public String getAvatarUri() {
                 Log.w(TAG, "Cannot generate avatar URI: sender or username is null");
                 return null;
             }
-            avatarPath = "/avatar/" + sender.username;
-            if (BuildConfig.DEBUG) {
-                Log.d(TAG, "Generated avatar URI for user: " + sender.username);
+            try {
+                avatarPath = "/avatar/" + URLEncoder.encode(sender.username, StandardCharsets.UTF_8);
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "Generated avatar URI for user: " + sender.username);
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to encode username", e);
+                return null;
             }
         } else {
             // Group/Channel/Livechat: use room avatar
             if (rid == null || rid.isEmpty()) {
                 Log.w(TAG, "Cannot generate avatar URI: rid is null for non-DM");
                 return null;
             }
-            avatarPath = "/avatar/room/" + rid;
-            if (BuildConfig.DEBUG) {
-                Log.d(TAG, "Generated avatar URI for room: " + rid);
+            try {
+                avatarPath = "/avatar/room/" + URLEncoder.encode(rid, StandardCharsets.UTF_8);
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "Generated avatar URI for room: " + rid);
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to encode rid", e);
+                return null;
             }
         }
 

app/lib/notifications/index.ts

@@ -21,9 +21,13 @@ export const onNotification = (push: INotification): void => {
 	// Handle video conf notification actions (Accept/Decline buttons)
 	if (identifier === 'ACCEPT_ACTION' || identifier === 'DECLINE_ACTION') {
 		if (push?.payload?.ejson) {
-			const notification = EJSON.parse(push.payload.ejson);
-			store.dispatch(deepLinkingClickCallPush({ ...notification, event: identifier === 'ACCEPT_ACTION' ? 'accept' : 'decline' }));
-			return;
+			try {
+				const notification = EJSON.parse(push.payload.ejson);
+				store.dispatch(deepLinkingClickCallPush({ ...notification, event: identifier === 'ACCEPT_ACTION' ? 'accept' : 'decline' }));
+				return;
+			} catch (e) {
+				console.warn('Failed to parse video conf notification:', e);
+			}
 		}
 	}
 
@@ -49,9 +53,11 @@ export const onNotification = (push: INotification): void => {
 				p: 'group',
 				l: 'channels'
 			};
-			let roomName = type === SubscriptionType.DIRECT ? sender.username : name;
-			if (type === SubscriptionType.OMNICHANNEL) {
-				roomName = sender.name;
+			let roomName = name;
+			if (type === SubscriptionType.DIRECT) {
+				roomName = sender?.username ?? name;
+			} else if (type === SubscriptionType.OMNICHANNEL) {
+				roomName = sender?.name ?? name;
 			}
 
 			const params = {

ios/ReplyNotification.swift

@@ -88,6 +88,11 @@ class ReplyNotification: NSObject, UNUserNotificationCenterDelegate {
           let ejsonData = ejsonString.data(using: .utf8),
           let payload = try? JSONDecoder().decode(Payload.self, from: ejsonData),
           let rid = payload.rid else {
+      // Show failure notification to user
+      let content = UNMutableNotificationContent()
+      content.body = "Failed to send reply. Invalid notification data."
+      let request = UNNotificationRequest(identifier: "replyPayloadFailure", content: content, trigger: nil)
+      UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)
       completionHandler()
       return
     }
@@ -102,6 +107,7 @@ class ReplyNotification: NSObject, UNUserNotificationCenterDelegate {
         UIApplication.shared.endBackgroundTask(backgroundTask)
         backgroundTask = .invalid
       }
+      completionHandler()
     }
 
     rocketchat.sendMessage(rid: rid, message: message, threadIdentifier: payload.tmid) { response in
@@ -118,7 +124,7 @@ class ReplyNotification: NSObject, UNUserNotificationCenterDelegate {
         guard let response = response, response.success else {
           // Show failure notification
           let content = UNMutableNotificationContent()
-          content.body = "Failed to reply message."
+          content.body = "Failed to send reply."
           let request = UNNotificationRequest(identifier: "replyFailure", content: content, trigger: nil)
           UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)
           return