Refactor avatar handling in notifications

- Moved avatar fetching logic to NotificationHelper for better reusability.
- Updated CustomPushNotification to utilize the new fetchAvatarBitmap method.
- Enhanced Ejson class with a buildAvatarUri helper method for cleaner avatar URI generation.
- Added support for fetching caller avatar in VideoConfNotification, improving notification display.

Author: diegolmello

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;
@@ -469,25 +463,7 @@ private void cancelPreviousFallbackNotifications(Ejson ejson) {
     }
 
     private Bitmap getAvatar(String uri) {
-        if (uri == null || uri.isEmpty()) {
-            return largeIcon();
-        }
-        
-        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);
-            return largeIcon();
-        }
+        return NotificationHelper.fetchAvatarBitmap(mContext, uri, largeIcon());
     }
 
     private Bitmap largeIcon() {

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

@@ -60,21 +60,29 @@ private MMKV getMMKV() {
         return MMKV.mmkvWithID("default", MMKV.SINGLE_PROCESS_MODE);
     }
 
-    public String getAvatarUri() {
+    /**
+     * 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");
+            Log.w(TAG, "Cannot generate " + errorContext + " avatar URI: missing auth credentials");
             return null;
         }
 
+        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
@@ -104,7 +112,27 @@ public String getAvatarUri() {
             }
         }
 
-        return server + avatarPath + "?format=png&size=100&rc_token=" + userToken + "&rc_uid=" + uid;
+        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;
+        }
+        
+        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() {
@@ -215,6 +243,7 @@ static class Sender {
     static class Caller {
         String _id;
         String name;
+        String username;
     }
 
     static class Content {

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

@@ -1,6 +1,18 @@
 package chat.rocket.reactnative.notification;
 
-import android.os.Build;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import chat.rocket.reactnative.BuildConfig;
 
@@ -32,10 +44,44 @@ public static String sanitizeUrl(String url) {
      * @return User-Agent string
      */
     public static String getUserAgent() {
-        String systemVersion = Build.VERSION.RELEASE;
+        String systemVersion = android.os.Build.VERSION.RELEASE;
         String appVersion = BuildConfig.VERSION_NAME;
         int buildNumber = BuildConfig.VERSION_CODE;
         return String.format("RC Mobile; android %s; v%s (%d)", systemVersion, appVersion, buildNumber);
     }
+    
+    /**
+     * Fetches avatar bitmap from URI using Glide.
+     * Uses a 3-second timeout to avoid blocking the FCM service for too long.
+     * 
+     * @param context The application context
+     * @param uri The avatar URI to fetch
+     * @param fallbackIcon Optional fallback bitmap (null if no fallback desired)
+     * @return Avatar bitmap, or fallbackIcon if fetch fails, or null if no fallback provided
+     */
+    public static Bitmap fetchAvatarBitmap(Context context, String uri, @Nullable Bitmap fallbackIcon) {
+        if (uri == null || uri.isEmpty()) {
+            return fallbackIcon;
+        }
+        
+        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(context)
+                    .asBitmap()
+                    .apply(RequestOptions.bitmapTransform(new RoundedCorners(10)))
+                    .load(uri)
+                    .submit(100, 100)
+                    .get(3, TimeUnit.SECONDS);
+            
+            return avatar != null ? avatar : fallbackIcon;
+        } catch (final ExecutionException | InterruptedException | TimeoutException e) {
+            Log.e("NotificationHelper", "Failed to fetch avatar", e);
+            if (e instanceof InterruptedException) {
+                Thread.currentThread().interrupt();
+            }
+            return fallbackIcon;
+        }
+    }
 }
 

android/app/src/main/java/chat/rocket/reactnative/notification/VideoConfNotification.kt

@@ -8,6 +8,7 @@ import android.content.Context
 import android.content.Intent
 import android.media.AudioAttributes
 import android.media.RingtoneManager
+import android.graphics.Bitmap
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
@@ -155,6 +156,14 @@ class VideoConfNotification(private val context: Context) {
         val packageName = context.packageName
         val smallIconResId = context.resources.getIdentifier("ic_notification", "drawable", packageName)
 
+        // Fetch caller avatar
+        val avatarUri = ejson.getCallerAvatarUri()
+        val avatarBitmap = if (avatarUri != null) {
+            getAvatar(avatarUri)
+        } else {
+            null
+        }
+
         // Build notification
         val builder = NotificationCompat.Builder(context, CHANNEL_ID).apply {
             setSmallIcon(smallIconResId)
@@ -169,6 +178,11 @@ class VideoConfNotification(private val context: Context) {
             setContentIntent(fullScreenPendingIntent)
             addAction(0, "Decline", declinePendingIntent)
             addAction(0, "Accept", acceptPendingIntent)
+            
+            // Set large icon (avatar) if available
+            if (avatarBitmap != null) {
+                setLargeIcon(avatarBitmap)
+            }
         }
 
         // Set sound for pre-O devices
@@ -194,6 +208,14 @@ class VideoConfNotification(private val context: Context) {
         return PendingIntent.getActivity(context, requestCode, intent, flags)
     }
 
+    /**
+     * Fetches avatar bitmap from URI using Glide.
+     * Returns null if fetch fails or times out, in which case notification will display without avatar.
+     */
+    private fun getAvatar(uri: String): Bitmap? {
+        return NotificationHelper.fetchAvatarBitmap(context, uri, null)
+    }
+
     /**
      * Cancels a video call notification.
      *