feat: Avatar on push notifications

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

@@ -18,9 +18,6 @@
 
 import androidx.annotation.Nullable;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
-import com.bumptech.glide.request.RequestOptions;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.google.gson.Gson;
 
@@ -30,9 +27,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import chat.rocket.reactnative.BuildConfig;
 import chat.rocket.reactnative.MainActivity;
@@ -61,7 +55,7 @@ public class CustomPushNotification {
 
     // Instance fields
     private final Context mContext;
-    private Bundle mBundle;
+    private volatile Bundle mBundle;
     private final NotificationManager notificationManager;
 
     public CustomPushNotification(Context context, Bundle bundle) {
@@ -300,9 +294,6 @@ private void showNotification(Bundle bundle, Ejson ejson, String notId) {
         bundle.putString("senderId", hasSender ? ejson.sender._id : "1");
 
         String avatarUri = ejson != null ? ejson.getAvatarUri() : null;
-        if (ENABLE_VERBOSE_LOGS) {
-            Log.d(TAG, "[showNotification] avatarUri=" + (avatarUri != null ? "[present]" : "[null]"));
-        }
         bundle.putString("avatarUri", avatarUri);
 
         // Handle special notification types
@@ -379,10 +370,27 @@ private Notification.Builder buildNotification(int notificationId) {
         Boolean notificationLoaded = mBundle.getBoolean("notificationLoaded", false);
         Ejson ejson = safeFromJson(mBundle.getString("ejson", "{}"), Ejson.class);
 
+        // Determine the correct title based on notification type
+        String notificationTitle = title;
+        if (ejson != null && ejson.type != null) {
+            if ("p".equals(ejson.type) || "c".equals(ejson.type)) {
+                // For groups/channels, use room name if available, otherwise fall back to title
+                notificationTitle = (ejson.name != null && !ejson.name.isEmpty()) ? ejson.name : title;
+            } else if ("d".equals(ejson.type)) {
+                // For direct messages, use title (sender name from server)
+                notificationTitle = title;
+            } else if ("l".equals(ejson.type)) {
+                // For omnichannel, use sender name if available, otherwise fall back to title
+                notificationTitle = (ejson.sender != null && ejson.sender.name != null && !ejson.sender.name.isEmpty()) 
+                    ? ejson.sender.name : title;
+            }
+        }
+
         if (ENABLE_VERBOSE_LOGS) {
             Log.d(TAG, "[buildNotification] notId=" + notId);
             Log.d(TAG, "[buildNotification] notificationLoaded=" + notificationLoaded);
             Log.d(TAG, "[buildNotification] title=" + (title != null ? "[present]" : "[null]"));
+            Log.d(TAG, "[buildNotification] notificationTitle=" + (notificationTitle != null ? "[present]" : "[null]"));
             Log.d(TAG, "[buildNotification] message length=" + (message != null ? message.length() : 0));
         }
 
@@ -406,7 +414,7 @@ private Notification.Builder buildNotification(int notificationId) {
         }
 
         notification
-                .setContentTitle(title)
+                .setContentTitle(notificationTitle)
                 .setContentText(message)
                 .setContentIntent(pendingIntent)
                 .setPriority(Notification.PRIORITY_HIGH)
@@ -455,37 +463,7 @@ private void cancelPreviousFallbackNotifications(Ejson ejson) {
     }
 
     private Bitmap getAvatar(String uri) {
-        if (uri == null || uri.isEmpty()) {
-            if (ENABLE_VERBOSE_LOGS) {
-                Log.w(TAG, "getAvatar called with null/empty URI");
-            }
-            return largeIcon();
-        }
-
-        if (ENABLE_VERBOSE_LOGS) {
-            String sanitizedUri = uri;
-            int queryStart = uri.indexOf("?");
-            if (queryStart != -1) {
-                sanitizedUri = uri.substring(0, queryStart) + "?[auth_params]";
-            }
-            Log.d(TAG, "Fetching avatar from: " + sanitizedUri);
-        }
-
-        try {
-            // Use a 3-second timeout to avoid blocking the FCM service for too long
-            // FCM has a 10-second limit, so we need to fail fast and use fallback icon
-            Bitmap avatar = Glide.with(mContext)
-                    .asBitmap()
-                    .apply(RequestOptions.bitmapTransform(new RoundedCorners(10)))
-                    .load(uri)
-                    .submit(100, 100)
-                    .get(3, TimeUnit.SECONDS);
-
-            return avatar != null ? avatar : largeIcon();
-        } catch (final ExecutionException | InterruptedException | TimeoutException e) {
-            Log.e(TAG, "Failed to fetch avatar: " + e.getMessage(), e);
-            return largeIcon();
-        }
+        return NotificationHelper.fetchAvatarBitmap(mContext, uri, largeIcon());
     }
 
     private Bitmap largeIcon() {
@@ -506,7 +484,10 @@ private void notificationIcons(Notification.Builder notification, Bundle bundle)
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
             String avatarUri = ejson != null ? ejson.getAvatarUri() : null;
             if (avatarUri != null) {
-                notification.setLargeIcon(getAvatar(avatarUri));
+                Bitmap avatar = getAvatar(avatarUri);
+                if (avatar != null) {
+                    notification.setLargeIcon(avatar);
+                }
             }
         }
     }
@@ -517,8 +498,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;
     }
@@ -559,7 +543,23 @@ private void notificationStyle(Notification.Builder notification, int notId, Bun
             }
 
             String title = bundle.getString("title");
-            messageStyle.setConversationTitle(title);
+            // Determine the correct conversation title based on notification type
+            Ejson bundleEjson = safeFromJson(bundle.getString("ejson", "{}"), Ejson.class);
+            String conversationTitle = title;
+            if (bundleEjson != null && bundleEjson.type != null) {
+                if ("p".equals(bundleEjson.type) || "c".equals(bundleEjson.type)) {
+                    // For groups/channels, use room name if available, otherwise fall back to title
+                    conversationTitle = (bundleEjson.name != null && !bundleEjson.name.isEmpty()) ? bundleEjson.name : title;
+                } else if ("d".equals(bundleEjson.type)) {
+                    // For direct messages, use title (sender name from server)
+                    conversationTitle = title;
+                } else if ("l".equals(bundleEjson.type)) {
+                    // For omnichannel, use sender name if available, otherwise fall back to title
+                    conversationTitle = (bundleEjson.sender != null && bundleEjson.sender.name != null && !bundleEjson.sender.name.isEmpty()) 
+                        ? bundleEjson.sender.name : title;
+                }
+            }
+            messageStyle.setConversationTitle(conversationTitle);
 
             if (bundles != null) {
                 for (Bundle data : bundles) {

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.io.UnsupportedEncodingException;
 
 import chat.rocket.reactnative.BuildConfig;
 import chat.rocket.reactnative.storage.MMKVKeyManager;
@@ -40,6 +42,7 @@ public class Ejson {
     String notificationType;
     String messageType;
     String senderName;
+    String name; // Room name for groups/channels
     String msg;
     Integer status; // For video conf: 0=incoming, 4=cancelled
 
@@ -57,33 +60,79 @@ private MMKV getMMKV() {
         return MMKV.mmkvWithID("default", MMKV.SINGLE_PROCESS_MODE);
     }
 
-    public String getAvatarUri() {
-        if (sender == null || sender.username == null || sender.username.isEmpty()) {
-            Log.w(TAG, "Cannot generate avatar URI: sender or username is null");
-            return null;
-        }
-
+    /**
+     * Helper method to build avatar URI from avatar path.
+     * Validates server URL and credentials, then constructs the full URI.
+     */
+    private String buildAvatarUri(String avatarPath, String errorContext) {
         String server = serverURL();
         if (server == null || server.isEmpty()) {
-            Log.w(TAG, "Cannot generate avatar URI: serverURL is null");
+            Log.w(TAG, "Cannot generate " + errorContext + " avatar URI: serverURL is null");
             return null;
         }
 
         String userToken = token();
         String uid = userId();
 
         if (userToken.isEmpty() || uid.isEmpty()) {
-            Log.w(TAG, "Cannot generate avatar URI: missing auth credentials (token=" + !userToken.isEmpty() + ", uid=" + !uid.isEmpty() + ")");
+            Log.w(TAG, "Cannot generate " + errorContext + " avatar URI: missing auth credentials");
             return null;
         }
 
-        String uri = server + "/avatar/" + sender.username + "?format=png&size=100&rc_token=" + userToken + "&rc_uid=" + uid;
+        return server + avatarPath + "?format=png&size=100&rc_token=" + userToken + "&rc_uid=" + uid;
+    }
+
+    public String getAvatarUri() {
+        String avatarPath;
+
+        // For DMs, show sender's avatar; for groups/channels, show room avatar
+        if ("d".equals(type)) {
+            // Direct message: use sender's avatar
+            if (sender == null || sender.username == null || sender.username.isEmpty()) {
+                Log.w(TAG, "Cannot generate avatar URI: sender or username is null");
+                return null;
+            }
+            try {
+                avatarPath = "/avatar/" + URLEncoder.encode(sender.username, "UTF-8");
+            } catch (UnsupportedEncodingException 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;
+            }
+            try {
+                avatarPath = "/avatar/room/" + URLEncoder.encode(rid, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                Log.e(TAG, "Failed to encode rid", e);
+                return null;
+            }
+        }
 
-        if (BuildConfig.DEBUG) {
-            Log.d(TAG, "Generated avatar URI for user: " + sender.username);
+        return buildAvatarUri(avatarPath, "");
+    }
+
+    /**
+     * Generates avatar URI for video conference caller.
+     * Returns null if caller username is not available (username is required for avatar endpoint).
+     */
+    public String getCallerAvatarUri() {
+        // Check if caller exists and has username (required - /avatar/{userId} endpoint doesn't exist)
+        if (caller == null || caller.username == null || caller.username.isEmpty()) {
+            Log.w(TAG, "Cannot generate caller avatar URI: caller or username is null");
+            return null;
         }
 
-        return uri;
+        try {
+            String avatarPath = "/avatar/" + URLEncoder.encode(caller.username, "UTF-8");
+            return buildAvatarUri(avatarPath, "caller");
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Failed to encode caller username", e);
+            return null;
+        }
     }
 
     public String token() {
@@ -194,6 +243,7 @@ static class Sender {
     static class Caller {
         String _id;
         String name;
+        String username;
     }
 
     static class Content {