chore: bump version to 4.11.139 [skip ci]

Use MessagingStyle with persisted history so rapid messages append instead of each update wiping the previous body.

android/app/src/main/java/com/paarrot/app/MainActivity.java

@@ -15,6 +15,19 @@ public class MainActivity extends BridgeActivity {
         setupImageKeyboardSupport();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        // Keep native sync suppression in sync with the real Activity lifecycle.
+        MatrixSyncService.appInForeground = true;
+    }
+
+    @Override
+    public void onPause() {
+        MatrixSyncService.appInForeground = false;
+        super.onPause();
+    }
+
     /** Advertise image MIME types and receive Gboard / paste / drag-drop media. */
     private void setupImageKeyboardSupport() {
         if (bridge == null) return;

android/app/src/main/java/com/paarrot/app/MatrixSyncService.kt

@@ -14,7 +14,16 @@ import android.util.Base64
 import android.util.Log
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffXfermode
+import android.graphics.Rect
 import androidx.core.app.NotificationCompat
+import androidx.core.app.Person
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.IconCompat
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -22,6 +31,7 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.json.JSONArray
 import org.json.JSONObject
 import java.net.HttpURLConnection
 import java.net.URL
@@ -69,7 +79,7 @@ class MatrixSyncService : Service() {
 
         serviceScope.launch {
             try {
-                runSingleSyncFetch(homeserver, token, userId)
+                runSingleSyncFetch(homeserver, token, userId, triggerReason)
                 Log.d(TAG, "One-shot sync completed (reason=$triggerReason)")
             } finally {
                 stopForegroundCompat()
@@ -85,7 +95,12 @@ class MatrixSyncService : Service() {
         job.cancel()
     }
 
-    private suspend fun runSingleSyncFetch(homeserver: String, token: String, userId: String) {
+    private suspend fun runSingleSyncFetch(
+        homeserver: String,
+        token: String,
+        userId: String,
+        triggerReason: String,
+    ) {
         val prefs = applicationContext.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
         val since = prefs.getString(KEY_SINCE, null)
         val isFirstSync = since == null
@@ -102,8 +117,24 @@ class MatrixSyncService : Service() {
                     if (nextBatch != null) {
                         prefs.edit().putString(KEY_SINCE, nextBatch).apply()
 
-                        if (!isFirstSync && !appInForeground) {
+                        // Push wakes should still notify even if the WebView leftover
-                            processRoomEvents(json, userId)
+                        // "foreground" flag is stale; JS path is suppressed while backgrounded.
+                        val fromPush = triggerReason.startsWith("unifiedpush")
+                        val suppressBecauseUi = appInForeground && !fromPush
+                        if (!isFirstSync) {
+                            // Always dismiss trays when another device (or this one) marked rooms read,
+                            // even while the UI is foregrounded and posting is suppressed.
+                            dismissClearedRoomNotifications(json)
+                            if (!suppressBecauseUi) {
+                                processRoomEvents(json, userId)
+                            } else {
+                                Log.d(
+                                    TAG,
+                                    "Skipping notification posts (foreground=$appInForeground, reason=$triggerReason)",
+                                )
+                            }
+                        } else {
+                            Log.d(TAG, "Skipping notifications (firstSync=true, reason=$triggerReason)")
                         }
                     }
                 }
@@ -127,7 +158,8 @@ class MatrixSyncService : Service() {
     }
 
     private fun buildSyncUrl(base: String, since: String?): String {
-        val filter = """{"room":{"timeline":{"limit":10,"types":["m.room.message"]},"state":{"types":[]},"account_data":{"types":[]},"ephemeral":{"types":[]}},"account_data":{"types":[]},"presence":{"types":[]}}"""
+        // Include encrypted events — most DMs/rooms are E2EE and never emit plaintext m.room.message.
+        val filter = """{"room":{"timeline":{"limit":10,"types":["m.room.message","m.room.encrypted","m.sticker"]},"state":{"types":[]},"account_data":{"types":[]},"ephemeral":{"types":[]}},"account_data":{"types":[]},"presence":{"types":[]}}"""
         val encodedFilter = URLEncoder.encode(filter, "UTF-8")
         val sinceParam = if (since != null) "&since=${URLEncoder.encode(since, "UTF-8")}" else ""
         return "$base/_matrix/client/v3/sync?timeout=12000&filter=$encodedFilter$sinceParam"
@@ -167,6 +199,24 @@ class MatrixSyncService : Service() {
         val pushRules: JSONObject?,
     )
 
+    /**
+     * Cancel tray notifications for rooms the homeserver now reports as fully read.
+     * Covers “marked as read on another device” while this phone is backgrounded.
+     * Only acts when [unread_notifications] is present in this sync batch (count changed).
+     */
+    private fun dismissClearedRoomNotifications(sync: JSONObject) {
+        val joinedRooms = sync.optJSONObject("rooms")?.optJSONObject("join") ?: return
+        for (roomId in joinedRooms.keys().asSequence()) {
+            val roomData = joinedRooms.optJSONObject(roomId) ?: continue
+            if (!roomData.has("unread_notifications")) continue
+            val unread = roomData.optJSONObject("unread_notifications")
+            val notificationCount = unread?.optInt("notification_count", 0) ?: 0
+            if (notificationCount <= 0) {
+                clearRoomNotifications(applicationContext, roomId)
+            }
+        }
+    }
+
     private fun processRoomEvents(sync: JSONObject, myUserId: String) {
         val prefs = applicationContext.getSharedPreferences(SyncServicePlugin.PREFS, Context.MODE_PRIVATE)
         val homeserver = prefs.getString(EXTRA_HOMESERVER, null)?.trimEnd('/') ?: return
@@ -185,41 +235,71 @@ class MatrixSyncService : Service() {
             // Homeserver unread counts already apply push rules — skip rooms with nothing to notify.
             val unread = roomData.optJSONObject("unread_notifications")
             val notificationCount = unread?.optInt("notification_count", 0) ?: 0
+            val highlightCount = unread?.optInt("highlight_count", 0) ?: 0
             if (mode == RoomNotifyMode.MUTE || notificationCount <= 0) continue
 
             val mentionsOnly = mode == RoomNotifyMode.MENTIONS_AND_KEYWORDS
+            if (mentionsOnly && highlightCount <= 0) {
+                // Mentions-only rooms: without a highlight, skip (encrypted bodies can't be scanned).
+                continue
+            }
+
             val timeline = roomData.optJSONObject("timeline") ?: continue
             val events = timeline.optJSONArray("events") ?: continue
 
+            var notifiedForRoom = false
             for (i in 0 until events.length()) {
                 val event = events.optJSONObject(i) ?: continue
                 val eventId = event.optString("event_id")
+                val eventType = event.optString("type")
 
-                if (event.optString("type") != "m.room.message") continue
+                val isMessageLike =
+                    eventType == "m.room.message" ||
+                        eventType == "m.room.encrypted" ||
+                        eventType == "m.sticker"
+                if (!isMessageLike) continue
                 if (event.optString("sender") == myUserId) continue
                 if (eventId.isNotBlank() && !shownEventIds.add(eventId)) continue
 
-                val content = event.optJSONObject("content") ?: continue
+                val content = event.optJSONObject("content") ?: JSONObject()
-                if (mentionsOnly && !isSpecialMessage(content, notifyCtx)) continue
 
-                val msgtype = content.optString("msgtype")
+                // Plaintext mention/keyword filter; encrypted events already passed highlight_count.
-                val rawBody = content.optString("body")
+                if (
-                val body = when (msgtype) {
+                    mentionsOnly &&
-                    "m.image"   -> if (rawBody.isNotBlank()) "📷 $rawBody" else "📷 Photo"
+                    eventType != "m.room.encrypted" &&
-                    "m.video"   -> if (rawBody.isNotBlank()) "🎥 $rawBody" else "🎥 Video"
+                    !isSpecialMessage(content, notifyCtx)
-                    "m.audio"   -> if (rawBody.isNotBlank()) "🎵 $rawBody" else "🎵 Audio"
+                ) {
-                    "m.file"    -> if (rawBody.isNotBlank()) "📎 $rawBody" else "📎 File"
+                    continue
-                    "m.sticker" -> if (rawBody.isNotBlank()) "🖼️ $rawBody" else "🖼️ Sticker"
-                    else        -> rawBody.takeIf { it.isNotBlank() } ?: continue
                 }
 
+                val body = when {
+                    eventType == "m.room.encrypted" -> "Encrypted message"
+                    eventType == "m.sticker" -> {
+                        val raw = content.optString("body")
+                        if (raw.isNotBlank()) "🖼️ $raw" else "🖼️ Sticker"
+                    }
+                    else -> {
+                        val msgtype = content.optString("msgtype")
+                        val rawBody = content.optString("body")
+                        when (msgtype) {
+                            "m.image"   -> if (rawBody.isNotBlank()) "📷 $rawBody" else "📷 Photo"
+                            "m.video"   -> if (rawBody.isNotBlank()) "🎥 $rawBody" else "🎥 Video"
+                            "m.audio"   -> if (rawBody.isNotBlank()) "🎵 $rawBody" else "🎵 Audio"
+                            "m.file"    -> if (rawBody.isNotBlank()) "📎 $rawBody" else "📎 File"
+                            "m.sticker" -> if (rawBody.isNotBlank()) "🖼️ $rawBody" else "🖼️ Sticker"
+                            else        -> rawBody.takeIf { it.isNotBlank() }
+                        }
+                    }
+                } ?: continue
+
                 val sender = event.optString("sender")
                 val profile = resolveProfile(sender, homeserver, token)
 
-                // For unencrypted image/sticker messages, try to download a preview bitmap.
+                val msgtype = content.optString("msgtype")
-                // Encrypted messages have a `file` object instead of a top-level `url`.
                 val inlineImage: Bitmap? = if (
-                    (msgtype == "m.image" || msgtype == "m.sticker") && !content.has("file")
+                    eventType != "m.room.encrypted" &&
+                    (msgtype == "m.image" || msgtype == "m.sticker" || eventType == "m.sticker") &&
+                    !content.has("file")
                 ) {
                     content.optString("url").takeIf { it.startsWith("mxc://") }?.let { mxc ->
                         mxcToDownloadUrls(mxc, homeserver)
@@ -236,6 +316,21 @@ class MatrixSyncService : Service() {
                     inlineImage,
                     resolveGroupInfo(roomId, notifyCtx),
                 )
+                notifiedForRoom = true
+            }
+
+            // Fallback: HS says there are notifications but timeline filter missed usable events.
+            if (!notifiedForRoom && notificationCount > 0) {
+                val groupInfo = resolveGroupInfo(roomId, notifyCtx)
+                showMessageNotification(
+                    nm,
+                    roomId,
+                    groupInfo.roomName.ifBlank { "New message" },
+                    if (mentionsOnly) "New mention" else "New message",
+                    null,
+                    null,
+                    groupInfo,
+                )
             }
         }
     }
@@ -540,18 +635,18 @@ class MatrixSyncService : Service() {
         groupInfo: NotificationGroupInfo,
     ) {
         val isDm = groupInfo.kind == "direct"
-        val title = if (isDm) sender else groupInfo.roomName.ifBlank { sender }
-        val text = if (isDm) body else "$sender: $body"
         postMessageNotification(
             this,
             roomId = roomId,
-            title = title,
+            senderName = sender,
-            body = text,
+            messageText = body,
+            conversationTitle = if (isDm) null else groupInfo.roomName.ifBlank { null },
             groupId = groupInfo.groupId,
             groupName = groupInfo.groupName,
             kind = groupInfo.kind,
             largeIcon = largeIcon,
             inlineImage = inlineImage,
+            path = null,
         )
     }
 
@@ -612,6 +707,8 @@ class MatrixSyncService : Service() {
         private const val GROUP_DIRECTS = "paarrot_directs"
         private const val GROUP_HOME = "paarrot_home"
         private const val MIN_WAKE_INTERVAL_MS = 7_500L
+        private const val MAX_MESSAGING_HISTORY = 8
+        private const val KEY_MSG_HISTORY_PREFIX = "notif_hist_"
         const val MODE_ONE_SHOT = "one_shot"
 
         /** Same hashing scheme as JS `notificationIdForRoom` so clear-on-read hits both paths. */
@@ -675,61 +772,286 @@ class MatrixSyncService : Service() {
             }
         }
 
+        /** Crop a bitmap into a circle for the notification avatar slot. */
+        fun toCircularBitmap(bitmap: Bitmap): Bitmap {
+            val size = minOf(bitmap.width, bitmap.height)
+            val output = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+            val canvas = Canvas(output)
+            val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+            val radius = size / 2f
+            canvas.drawCircle(radius, radius, radius, paint)
+            paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_IN)
+            val left = (bitmap.width - size) / 2
+            val top = (bitmap.height - size) / 2
+            canvas.drawBitmap(
+                bitmap,
+                Rect(left, top, left + size, top + size),
+                Rect(0, 0, size, size),
+                paint,
+            )
+            return output
+        }
+
+        /** Soften URLs so Android Assistant doesn't add "Open link in Firefox" actions. */
+        fun sanitizeNotificationText(text: String): String =
+            text.replace(Regex("""https?://\S+""", RegexOption.IGNORE_CASE), "🔗 link")
+
+        /**
+         * Publish a long-lived conversation shortcut so Android 11+ shows the sender
+         * avatar in the collapsed shade (MessagingStyle alone only shows it expanded).
+         */
+        private fun publishConversationShortcut(
+            context: Context,
+            roomId: String,
+            label: String,
+            person: Person,
+            launchIntent: Intent,
+        ): ShortcutInfoCompat {
+            val shortcutIntent = Intent(launchIntent).apply {
+                // Shortcuts require an explicit action.
+                if (action.isNullOrBlank()) {
+                    action = NotificationNavStore.ACTION_OPEN_NOTIFICATION
+                }
+            }
+            val icon = person.icon
+                ?: IconCompat.createWithResource(context, R.drawable.ic_stat_paarrot)
+            val shortcut = ShortcutInfoCompat.Builder(context, "room:$roomId")
+                .setShortLabel(label.take(25).ifBlank { "Chat" })
+                .setLongLabel(label.ifBlank { "Chat" })
+                .setIcon(icon)
+                .setIntent(shortcutIntent)
+                .setPerson(person)
+                .setLongLived(true)
+                .setCategories(setOf("android.shortcut.conversation"))
+                .build()
+            try {
+                ShortcutManagerCompat.pushDynamicShortcut(context, shortcut)
+            } catch (e: Exception) {
+                Log.w(TAG, "Failed to publish conversation shortcut: ${e.message}")
+            }
+            return shortcut
+        }
+
+        private data class PendingNotifMessage(
+            val sender: String,
+            val text: String,
+            val timestamp: Long,
+        )
+
+        private fun historyPrefsKey(roomId: String) = KEY_MSG_HISTORY_PREFIX + roomId
+
+        private fun loadMessageHistory(context: Context, roomId: String): List<PendingNotifMessage> {
+            val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
+                .getString(historyPrefsKey(roomId), null)
+                ?: return emptyList()
+            return try {
+                val arr = JSONArray(raw)
+                buildList {
+                    for (i in 0 until arr.length()) {
+                        val obj = arr.optJSONObject(i) ?: continue
+                        val sender = obj.optString("sender")
+                        val text = obj.optString("text")
+                        val ts = obj.optLong("ts", 0L)
+                        if (sender.isBlank() || text.isBlank()) continue
+                        add(PendingNotifMessage(sender, text, ts))
+                    }
+                }
+            } catch (e: Exception) {
+                Log.w(TAG, "Failed to load notification history for $roomId: ${e.message}")
+                emptyList()
+            }
+        }
+
+        private fun saveMessageHistory(
+            context: Context,
+            roomId: String,
+            messages: List<PendingNotifMessage>,
+        ) {
+            val arr = JSONArray()
+            for (msg in messages) {
+                arr.put(
+                    JSONObject()
+                        .put("sender", msg.sender)
+                        .put("text", msg.text)
+                        .put("ts", msg.timestamp)
+                )
+            }
+            context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
+                .edit()
+                .putString(historyPrefsKey(roomId), arr.toString())
+                .apply()
+        }
+
+        private fun clearMessageHistory(context: Context, roomId: String) {
+            context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
+                .edit()
+                .remove(historyPrefsKey(roomId))
+                .apply()
+        }
+
+        private fun appendMessageHistory(
+            context: Context,
+            roomId: String,
+            sender: String,
+            text: String,
+        ): List<PendingNotifMessage> {
+            val next = (loadMessageHistory(context, roomId) + PendingNotifMessage(
+                sender = sender,
+                text = text,
+                timestamp = System.currentTimeMillis(),
+            )).takeLast(MAX_MESSAGING_HISTORY)
+            saveMessageHistory(context, roomId, next)
+            return next
+        }
+
         /**
          * Posts a room notification (+ space/DM group summary) for both background sync
-         * and JS-driven Capacitor notifications (with optional avatar bitmap).
+         * and JS-driven Capacitor notifications.
+         *
+         * Uses MessagingStyle with persisted per-room history so rapid messages accumulate
+         * instead of each update wiping the previous body (stable per-room notification id).
+         * Avatar goes in largeIcon + conversation shortcut (visible when collapsed).
          */
         fun postMessageNotification(
             context: Context,
             roomId: String,
-            title: String,
+            senderName: String,
-            body: String,
+            messageText: String,
+            conversationTitle: String?,
             groupId: String,
             groupName: String,
             kind: String,
             largeIcon: Bitmap? = null,
             inlineImage: Bitmap? = null,
+            path: String? = null,
+            // Back-compat for older call sites that passed title/body.
+            title: String? = null,
+            body: String? = null,
         ) {
             val nm = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
             ensureMessageChannels(context)
 
-            val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+            val resolvedSender = senderName.ifBlank { title ?: "Someone" }
-                ?: Intent(context, MainActivity::class.java)
+            val resolvedMessage = sanitizeNotificationText(
+                messageText.ifBlank { body ?: "New message" },
+            )
+            val isDm = kind == "direct"
+            val resolvedConversation =
+                conversationTitle?.takeIf { it.isNotBlank() }
+                    ?: title?.takeIf { !isDm && it != resolvedSender }
+
+            val launchIntent = Intent(context, MainActivity::class.java).apply {
+                action = NotificationNavStore.ACTION_OPEN_NOTIFICATION
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or
+                    Intent.FLAG_ACTIVITY_SINGLE_TOP or
+                    Intent.FLAG_ACTIVITY_CLEAR_TOP or
+                    Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+                putExtra(EXTRA_ROOM_ID, roomId)
+                if (!path.isNullOrBlank()) {
+                    putExtra(NotificationNavStore.EXTRA_NAV_PATH, path)
+                }
+            }
             val roomNotifId = notificationIdForRoom(roomId)
             val pi = PendingIntent.getActivity(
                 context, roomNotifId, launchIntent,
                 PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
             )
 
+            val avatar = largeIcon?.let { toCircularBitmap(it) }
+            val personBuilder = Person.Builder()
+                .setName(resolvedSender)
+                .setKey("$roomId:$resolvedSender")
+                .setImportant(true)
+            if (avatar != null) {
+                personBuilder.setIcon(IconCompat.createWithBitmap(avatar))
+            }
+            val senderPerson = personBuilder.build()
+
+            val history = appendMessageHistory(context, roomId, resolvedSender, resolvedMessage)
+
             val channelId = channelIdForKindStatic(kind)
+            val collapsedTitle = if (isDm || resolvedConversation.isNullOrBlank()) {
+                resolvedSender
+            } else {
+                resolvedConversation
+            }
+            val collapsedText = if (isDm || resolvedConversation.isNullOrBlank()) {
+                resolvedMessage
+            } else {
+                "$resolvedSender: $resolvedMessage"
+            }
+
+            val shortcut = publishConversationShortcut(
+                context,
+                roomId,
+                collapsedTitle,
+                senderPerson,
+                launchIntent,
+            )
+
+            val selfPerson = Person.Builder()
+                .setName("Me")
+                .setKey("self")
+                .build()
+            val messagingStyle = NotificationCompat.MessagingStyle(selfPerson)
+                .setGroupConversation(!isDm)
+            if (!isDm && !resolvedConversation.isNullOrBlank()) {
+                messagingStyle.conversationTitle = resolvedConversation
+            }
+            for (msg in history) {
+                val person = if (msg.sender == resolvedSender) {
+                    senderPerson
+                } else {
+                    Person.Builder()
+                        .setName(msg.sender)
+                        .setKey("$roomId:${msg.sender}")
+                        .setImportant(true)
+                        .build()
+                }
+                messagingStyle.addMessage(
+                    NotificationCompat.MessagingStyle.Message(
+                        msg.text,
+                        msg.timestamp,
+                        person,
+                    )
+                )
+            }
+
             val builder = NotificationCompat.Builder(context, channelId)
                 .setSmallIcon(R.drawable.ic_stat_paarrot)
-                .setContentTitle(title)
+                .setContentTitle(collapsedTitle)
-                .setContentText(body)
+                .setContentText(collapsedText)
                 .setAutoCancel(true)
                 .setContentIntent(pi)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setCategory(NotificationCompat.CATEGORY_MESSAGE)
                 .setGroup(groupId)
                 .setOnlyAlertOnce(true)
+                .setNumber(history.size)
                 .setSubText(groupName)
+                .setShortcutId(shortcut.id)
+                .setShortcutInfo(shortcut)
+                // Prevent system "Open link in Chrome/Firefox" contextual actions on URL bodies.
+                .setAllowSystemGeneratedContextualActions(false)
+                .setStyle(messagingStyle)
 
             builder.extras.putString(EXTRA_ROOM_ID, roomId)
             builder.extras.putString(EXTRA_GROUP_ID, groupId)
+            if (!path.isNullOrBlank()) {
+                builder.extras.putString(NotificationNavStore.EXTRA_NAV_PATH, path)
+            }
 
-            if (largeIcon != null) builder.setLargeIcon(largeIcon)
+            // Collapsed shade avatar (large icon). Small icon must stay the monochrome app mark.
+            if (avatar != null) builder.setLargeIcon(avatar)
 
-            if (inlineImage != null) {
+            // Image attachments: keep MessagingStyle history; BigPicture would wipe prior lines.
+            if (inlineImage != null && history.size == 1) {
                 builder.setStyle(
                     NotificationCompat.BigPictureStyle()
                         .bigPicture(inlineImage)
-                        .bigLargeIcon(null as Bitmap?)
+                        .bigLargeIcon(avatar)
-                )
+                        .setBigContentTitle(collapsedTitle)
-            } else {
+                        .setSummaryText(collapsedText)
-                builder.setStyle(
-                    NotificationCompat.BigTextStyle()
-                        .bigText(body)
-                        .setSummaryText(groupName)
                 )
             }
 
@@ -746,6 +1068,7 @@ class MatrixSyncService : Service() {
                 .setCategory(NotificationCompat.CATEGORY_MESSAGE)
                 .setGroup(groupId)
                 .setGroupSummary(true)
+                .setAllowSystemGeneratedContextualActions(false)
                 .setStyle(
                     NotificationCompat.InboxStyle()
                         .setBigContentTitle(groupName)
@@ -758,6 +1081,7 @@ class MatrixSyncService : Service() {
         /** Cancel the tray notification posted for [roomId], if any. */
         fun clearRoomNotifications(context: Context, roomId: String) {
             if (roomId.isBlank()) return
+            clearMessageHistory(context, roomId)
             val nm = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
             val roomNotifId = notificationIdForRoom(roomId)
 
@@ -792,7 +1116,8 @@ class MatrixSyncService : Service() {
             }
         }
 
-        /** Set by [SyncServicePlugin] — true when the Capacitor WebView UI is visible. */
+        /** Set by [SyncServicePlugin] / [MainActivity] — true when the Capacitor UI is visible. */
+        @JvmField
         @Volatile
         var appInForeground = false
 

android/app/src/main/java/com/paarrot/app/NotificationNavStore.kt

@@ -0,0 +1,42 @@
+package com.paarrot.app
+
+import android.content.Intent
+
+/**
+ * Bridges notification tap intents into the Capacitor JS layer so we can
+ * navigate to the correct room when a tray notification is opened.
+ */
+object NotificationNavStore {
+    const val EXTRA_NAV_PATH = "paarrot_nav_path"
+    const val ACTION_OPEN_NOTIFICATION = "com.paarrot.app.OPEN_NOTIFICATION"
+
+    @Volatile
+    var pendingPath: String? = null
+
+    @Volatile
+    var pendingRoomId: String? = null
+
+    @Volatile
+    var plugin: SyncServicePlugin? = null
+
+    /** Read navigation extras from a notification tap [intent] and notify JS. */
+    fun handleIntent(intent: Intent?) {
+        if (intent == null) return
+        val path = intent.getStringExtra(EXTRA_NAV_PATH)?.takeIf { it.isNotBlank() }
+        val roomId = intent.getStringExtra(MatrixSyncService.EXTRA_ROOM_ID)?.takeIf { it.isNotBlank() }
+        if (path == null && roomId == null) return
+
+        pendingPath = path
+        pendingRoomId = roomId
+        plugin?.emitNotificationOpened(path, roomId)
+    }
+
+    /** Consume and clear the pending navigation target. */
+    fun consume(): Pair<String?, String?> {
+        val path = pendingPath
+        val roomId = pendingRoomId
+        pendingPath = null
+        pendingRoomId = null
+        return path to roomId
+    }
+}

android/app/src/main/java/com/paarrot/app/ShareHandlerPlugin.kt

@@ -1,10 +1,14 @@
 package com.paarrot.app
 
-import android.app.Activity
+import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
+import android.provider.MediaStore
+import android.util.Base64
+import android.webkit.MimeTypeMap
+import androidx.core.content.FileProvider
 import com.getcapacitor.JSArray
 import com.getcapacitor.JSObject
 import com.getcapacitor.Plugin
@@ -213,4 +217,168 @@ class ShareHandlerPlugin : Plugin() {
         ShareIntentStore.clearIntent(ShareIntentStore.pendingShare?.receivedAt)
         call.resolve()
     }
+
+    /**
+     * Save a base64-encoded file to the device gallery / Downloads.
+     * Capacitor WebView cannot use FileSaver / `<a download>`, so downloads go through MediaStore.
+     * Images → Pictures/Paarrot, videos → Movies/Paarrot, other → Download/Paarrot (API 29+).
+     * On older APIs or MediaStore failure, falls back to the system share sheet.
+     */
+    @PluginMethod
+    fun saveFile(call: PluginCall) {
+        val filename = call.getString("filename") ?: run {
+            call.reject("filename required")
+            return
+        }
+        val mimeType = call.getString("mimeType")
+            ?: guessMime(filename)
+            ?: "application/octet-stream"
+        val base64 = call.getString("base64") ?: run {
+            call.reject("base64 required")
+            return
+        }
+
+        try {
+            val cleaned = base64.substringAfter("base64,", base64).trim()
+            val bytes = Base64.decode(cleaned, Base64.DEFAULT)
+            if (bytes.isEmpty()) {
+                call.reject("empty file data")
+                return
+            }
+
+            val uri = saveBytes(bytes, filename, mimeType)
+            if (uri != null) {
+                android.widget.Toast.makeText(
+                    context,
+                    "Saved $filename",
+                    android.widget.Toast.LENGTH_SHORT
+                ).show()
+                call.resolve(
+                    JSObject()
+                        .put("saved", true)
+                        .put("uri", uri.toString())
+                )
+            } else {
+                shareBytes(bytes, filename, mimeType)
+                call.resolve(JSObject().put("saved", false).put("shared", true))
+            }
+        } catch (e: Exception) {
+            android.util.Log.e(TAG, "saveFile failed", e)
+            call.reject("Failed to save file: ${e.message}", e)
+        }
+    }
+
+    /**
+     * Open the system share sheet for a base64 file (Save to Files, Drive, etc.).
+     */
+    @PluginMethod
+    fun shareFile(call: PluginCall) {
+        val filename = call.getString("filename") ?: run {
+            call.reject("filename required")
+            return
+        }
+        val mimeType = call.getString("mimeType")
+            ?: guessMime(filename)
+            ?: "application/octet-stream"
+        val base64 = call.getString("base64") ?: run {
+            call.reject("base64 required")
+            return
+        }
+
+        try {
+            val cleaned = base64.substringAfter("base64,", base64).trim()
+            val bytes = Base64.decode(cleaned, Base64.DEFAULT)
+            shareBytes(bytes, filename, mimeType)
+            call.resolve(JSObject().put("shared", true))
+        } catch (e: Exception) {
+            android.util.Log.e(TAG, "shareFile failed", e)
+            call.reject("Failed to share file: ${e.message}", e)
+        }
+    }
+
+    private fun saveBytes(bytes: ByteArray, filename: String, mimeType: String): Uri? {
+        return when {
+            mimeType.startsWith("image/") ->
+                insertMedia(bytes, filename, mimeType, MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "Pictures/Paarrot")
+            mimeType.startsWith("video/") ->
+                insertMedia(bytes, filename, mimeType, MediaStore.Video.Media.EXTERNAL_CONTENT_URI, "Movies/Paarrot")
+            mimeType.startsWith("audio/") ->
+                insertMedia(bytes, filename, mimeType, MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, "Music/Paarrot")
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ->
+                insertMedia(bytes, filename, mimeType, MediaStore.Downloads.EXTERNAL_CONTENT_URI, "Download/Paarrot")
+            else -> null // share-sheet fallback (avoids WRITE_EXTERNAL_STORAGE on API < 29)
+        }
+    }
+
+    private fun insertMedia(
+        bytes: ByteArray,
+        filename: String,
+        mimeType: String,
+        collection: Uri,
+        relativePath: String
+    ): Uri? {
+        val values = ContentValues().apply {
+            put(MediaStore.MediaColumns.DISPLAY_NAME, filename)
+            put(MediaStore.MediaColumns.MIME_TYPE, mimeType)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                put(MediaStore.MediaColumns.RELATIVE_PATH, relativePath)
+                put(MediaStore.MediaColumns.IS_PENDING, 1)
+            }
+        }
+
+        val resolver = context.contentResolver
+        val uri = resolver.insert(collection, values) ?: return null
+        try {
+            resolver.openOutputStream(uri)?.use { it.write(bytes) }
+                ?: run {
+                    resolver.delete(uri, null, null)
+                    return null
+                }
+        } catch (e: Exception) {
+            resolver.delete(uri, null, null)
+            throw e
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            values.clear()
+            values.put(MediaStore.MediaColumns.IS_PENDING, 0)
+            resolver.update(uri, values, null, null)
+        }
+        return uri
+    }
+
+    private fun shareBytes(bytes: ByteArray, filename: String, mimeType: String) {
+        val cacheDir = File(context.cacheDir, "shares").apply { mkdirs() }
+        val safeName = filename.replace(Regex("[^a-zA-Z0-9._\\-]"), "_").take(128).ifEmpty { "file" }
+        val file = File(cacheDir, safeName)
+        FileOutputStream(file).use { it.write(bytes) }
+
+        val uri = FileProvider.getUriForFile(
+            context,
+            "${context.packageName}.fileprovider",
+            file
+        )
+
+        val intent = Intent(Intent.ACTION_SEND).apply {
+            type = mimeType
+            putExtra(Intent.EXTRA_STREAM, uri)
+            putExtra(Intent.EXTRA_SUBJECT, filename)
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        }
+
+        val chooser = Intent.createChooser(intent, "Save or share").apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        context.startActivity(chooser)
+    }
+
+    private fun guessMime(filename: String): String? {
+        val ext = filename.substringAfterLast('.', "").lowercase()
+        if (ext.isEmpty()) return null
+        return MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext)
+    }
+
+    companion object {
+        private const val TAG = "ShareHandlerPlugin"
+    }
 }

android/app/src/main/java/com/paarrot/app/SyncServicePlugin.kt

@@ -31,13 +31,44 @@ class SyncServicePlugin : Plugin() {
     override fun load() {
         super.load()
         UnifiedPushManager.setPlugin(this)
+        NotificationNavStore.plugin = this
+        NotificationNavStore.handleIntent(activity?.intent)
+    }
+
+    override fun handleOnNewIntent(intent: Intent?) {
+        super.handleOnNewIntent(intent)
+        if (intent != null) {
+            activity?.intent = intent
+        }
+        NotificationNavStore.handleIntent(intent)
     }
 
     override fun handleOnDestroy() {
         UnifiedPushManager.clearPlugin(this)
+        if (NotificationNavStore.plugin === this) {
+            NotificationNavStore.plugin = null
+        }
         super.handleOnDestroy()
     }
 
+    /** Emit a notificationOpened event toward the JS layer. */
+    fun emitNotificationOpened(path: String?, roomId: String?) {
+        val payload = JSObject()
+        if (path != null) payload.put("path", path)
+        if (roomId != null) payload.put("roomId", roomId)
+        notifyListeners("notificationOpened", payload, true)
+    }
+
+    /** Returns any pending notification navigation target from a tray tap. */
+    @PluginMethod
+    fun getPendingNotificationNav(call: PluginCall) {
+        val (path, roomId) = NotificationNavStore.consume()
+        val result = JSObject()
+        result.put("path", path)
+        result.put("roomId", roomId)
+        call.resolve(result)
+    }
+
     /** Persists Matrix credentials and starts UnifiedPush registration. */
     @PluginMethod
     fun start(call: PluginCall) {
@@ -132,23 +163,33 @@ class SyncServicePlugin : Plugin() {
      */
     @PluginMethod
     fun showNotification(call: PluginCall) {
-        val title = call.getString("title") ?: return call.reject("title required")
-        val body = call.getString("body") ?: return call.reject("body required")
         val roomId = call.getString("roomId") ?: return call.reject("roomId required")
         val groupId = call.getString("groupId") ?: "paarrot_home"
         val groupName = call.getString("groupName") ?: "Home"
         val kind = call.getString("kind") ?: "home"
+        val senderName = call.getString("senderName")
+            ?: call.getString("title")
+            ?: "Someone"
+        val messageText = call.getString("messageText")
+            ?: call.getString("body")
+            ?: "New message"
+        val conversationTitle = call.getString("conversationTitle")
+        val path = call.getString("path")
         val largeIconBase64 = call.getString("largeIconBase64")
+        val bigPictureBase64 = call.getString("bigPictureBase64")
 
         MatrixSyncService.postMessageNotification(
             context = context,
             roomId = roomId,
-            title = title,
+            senderName = senderName,
-            body = body,
+            messageText = messageText,
+            conversationTitle = conversationTitle,
             groupId = groupId,
             groupName = groupName,
             kind = kind,
             largeIcon = MatrixSyncService.decodeBase64Bitmap(largeIconBase64),
+            inlineImage = MatrixSyncService.decodeBase64Bitmap(bigPictureBase64),
+            path = path,
         )
         call.resolve(JSObject().put("shown", true))
     }

overlay/src/app/components/Pdf-viewer/PdfViewer.tsx

@@ -0,0 +1,251 @@
+/* eslint-disable no-param-reassign */
+/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
+import React, { FormEventHandler, MouseEventHandler, useEffect, useRef, useState } from 'react';
+import classNames from 'classnames';
+import { Box, Button, Chip, Header, IconButton, Input, Menu, PopOut, RectCords, Scroll, Spinner, Text, as, config } from 'folds';
+import { Icon, Icons } from '../icons';
+import FocusTrap from 'focus-trap-react';
+import { saveMediaBlob } from '../../utils/saveMedia';
+import * as css from './PdfViewer.css';
+import { AsyncStatus } from '../../hooks/useAsyncCallback';
+import { useZoom } from '../../hooks/useZoom';
+import { createPage, usePdfDocumentLoader, usePdfJSLoader } from '../../plugins/pdfjs-dist';
+import { stopPropagation } from '../../utils/keyboard';
+
+export type PdfViewerProps = {
+  name: string;
+  src: string;
+  requestClose: () => void;
+};
+
+export const PdfViewer = as<'div', PdfViewerProps>(
+  ({ className, name, src, requestClose, ...props }, ref) => {
+    const containerRef = useRef<HTMLDivElement>(null);
+    const scrollRef = useRef<HTMLDivElement>(null);
+    const { zoom, zoomIn, zoomOut, setZoom } = useZoom(0.2);
+
+    const [pdfJSState, loadPdfJS] = usePdfJSLoader();
+    const [docState, loadPdfDocument] = usePdfDocumentLoader(
+      pdfJSState.status === AsyncStatus.Success ? pdfJSState.data : undefined,
+      src
+    );
+    const isLoading =
+      pdfJSState.status === AsyncStatus.Loading || docState.status === AsyncStatus.Loading;
+    const isError =
+      pdfJSState.status === AsyncStatus.Error || docState.status === AsyncStatus.Error;
+    const [pageNo, setPageNo] = useState(1);
+    const [jumpAnchor, setJumpAnchor] = useState<RectCords>();
+
+    useEffect(() => {
+      loadPdfJS();
+    }, [loadPdfJS]);
+    useEffect(() => {
+      if (pdfJSState.status === AsyncStatus.Success) {
+        loadPdfDocument();
+      }
+    }, [pdfJSState, loadPdfDocument]);
+
+    useEffect(() => {
+      if (docState.status === AsyncStatus.Success) {
+        const doc = docState.data;
+        if (pageNo < 0 || pageNo > doc.numPages) return;
+        createPage(doc, pageNo, { scale: zoom }).then((canvas) => {
+          const container = containerRef.current;
+          if (!container) return;
+          container.textContent = '';
+          container.append(canvas);
+          scrollRef.current?.scrollTo({
+            top: 0,
+          });
+        });
+      }
+    }, [docState, pageNo, zoom]);
+
+    const handleDownload = async () => {
+      try {
+        const res = await fetch(src);
+        if (!res.ok) throw new Error('Failed to fetch PDF');
+        await saveMediaBlob(await res.blob(), name);
+      } catch (error) {
+        console.warn('[PdfViewer] Failed to download:', error);
+      }
+    };
+
+    const handleJumpSubmit: FormEventHandler<HTMLFormElement> = (evt) => {
+      evt.preventDefault();
+      if (docState.status !== AsyncStatus.Success) return;
+      const jumpInput = evt.currentTarget.jumpInput as HTMLInputElement;
+      if (!jumpInput) return;
+      const jumpTo = parseInt(jumpInput.value, 10);
+      setPageNo(Math.max(1, Math.min(docState.data.numPages, jumpTo)));
+      setJumpAnchor(undefined);
+    };
+
+    const handlePrevPage = () => {
+      setPageNo((n) => Math.max(n - 1, 1));
+    };
+
+    const handleNextPage = () => {
+      if (docState.status !== AsyncStatus.Success) return;
+      setPageNo((n) => Math.min(n + 1, docState.data.numPages));
+    };
+
+    const handleOpenJump: MouseEventHandler<HTMLButtonElement> = (evt) => {
+      setJumpAnchor(evt.currentTarget.getBoundingClientRect());
+    };
+
+    return (
+      <Box className={classNames(css.PdfViewer, className)} direction="Column" {...props} ref={ref}>
+        <Header className={css.PdfViewerHeader} size="400">
+          <Box grow="Yes" alignItems="Center" gap="200">
+            <IconButton size="300" radii="300" onClick={requestClose}>
+              <Icon size="50" src={Icons.ArrowLeft} />
+            </IconButton>
+            <Text size="T300" truncate>
+              {name}
+            </Text>
+          </Box>
+          <Box shrink="No" alignItems="Center" gap="200">
+            <IconButton
+              variant={zoom < 1 ? 'Success' : 'SurfaceVariant'}
+              outlined={zoom < 1}
+              size="300"
+              radii="Pill"
+              onClick={zoomOut}
+              aria-label="Zoom Out"
+            >
+              <Icon size="50" src={Icons.Minus} />
+            </IconButton>
+            <Chip variant="SurfaceVariant" radii="Pill" onClick={() => setZoom(zoom === 1 ? 2 : 1)}>
+              <Text size="B300">{Math.round(zoom * 100)}%</Text>
+            </Chip>
+            <IconButton
+              variant={zoom > 1 ? 'Success' : 'SurfaceVariant'}
+              outlined={zoom > 1}
+              size="300"
+              radii="Pill"
+              onClick={zoomIn}
+              aria-label="Zoom In"
+            >
+              <Icon size="50" src={Icons.Plus} />
+            </IconButton>
+            <Chip
+              variant="Primary"
+              onClick={handleDownload}
+              radii="300"
+              before={<Icon size="50" src={Icons.Download} />}
+            >
+              <Text size="B300">Download</Text>
+            </Chip>
+          </Box>
+        </Header>
+        <Box direction="Column" grow="Yes" alignItems="Center" justifyContent="Center" gap="200">
+          {isLoading && <Spinner variant="Secondary" size="600" />}
+          {isError && (
+            <>
+              <Text>Failed to load PDF</Text>
+              <Button
+                variant="Critical"
+                fill="Soft"
+                size="300"
+                radii="300"
+                before={<Icon src={Icons.Warning} size="50" />}
+                onClick={loadPdfJS}
+              >
+                <Text size="B300">Retry</Text>
+              </Button>
+            </>
+          )}
+          {docState.status === AsyncStatus.Success && (
+            <Scroll
+              ref={scrollRef}
+              size="300"
+              direction="Both"
+              variant="Surface"
+              visibility="Hover"
+            >
+              <Box>
+                <div className={css.PdfViewerContent} ref={containerRef} />
+              </Box>
+            </Scroll>
+          )}
+        </Box>
+        {docState.status === AsyncStatus.Success && (
+          <Header as="footer" className={css.PdfViewerFooter} size="400">
+            <Chip
+              variant="Secondary"
+              radii="300"
+              before={<Icon size="50" src={Icons.ChevronLeft} />}
+              onClick={handlePrevPage}
+              aria-disabled={pageNo <= 1}
+            >
+              <Text size="B300">Previous</Text>
+            </Chip>
+            <Box grow="Yes" justifyContent="Center" alignItems="Center" gap="200">
+              <PopOut
+                anchor={jumpAnchor}
+                align="Center"
+                position="Top"
+                content={
+                  <FocusTrap
+                    focusTrapOptions={{
+                      initialFocus: false,
+                      onDeactivate: () => setJumpAnchor(undefined),
+                      clickOutsideDeactivates: true,
+                      escapeDeactivates: stopPropagation,
+                    }}
+                  >
+                    <Menu variant="Surface">
+                      <Box
+                        as="form"
+                        onSubmit={handleJumpSubmit}
+                        style={{ padding: config.space.S200 }}
+                        direction="Column"
+                        gap="200"
+                      >
+                        <Input
+                          name="jumpInput"
+                          size="300"
+                          variant="Background"
+                          defaultValue={pageNo}
+                          min={1}
+                          max={docState.data.numPages}
+                          step={1}
+                          outlined
+                          type="number"
+                          radii="300"
+                          aria-label="Page Number"
+                        />
+                        <Button type="submit" size="300" variant="Primary" radii="300">
+                          <Text size="B300">Jump To Page</Text>
+                        </Button>
+                      </Box>
+                    </Menu>
+                  </FocusTrap>
+                }
+              >
+                <Chip
+                  onClick={handleOpenJump}
+                  variant="SurfaceVariant"
+                  radii="300"
+                  aria-pressed={jumpAnchor !== undefined}
+                >
+                  <Text size="B300">{`${pageNo}/${docState.data.numPages}`}</Text>
+                </Chip>
+              </PopOut>
+            </Box>
+            <Chip
+              variant="Primary"
+              radii="300"
+              after={<Icon size="50" src={Icons.ChevronRight} />}
+              onClick={handleNextPage}
+              aria-disabled={pageNo >= docState.data.numPages}
+            >
+              <Text size="B300">Next</Text>
+            </Chip>
+          </Header>
+        )}
+      </Box>
+    );
+  }
+);

overlay/src/app/components/image-viewer/ImageViewer.tsx

@@ -0,0 +1,107 @@
+/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
+import React from 'react';
+import classNames from 'classnames';
+import { Box, Chip, Header, IconButton, Text, as } from 'folds';
+import { Icon, Icons } from '../icons';
+import * as css from './ImageViewer.css';
+import { useZoom } from '../../hooks/useZoom';
+import { usePan } from '../../hooks/usePan';
+import { downloadAndSaveMedia } from '../../utils/saveMedia';
+import { getCurrentAccessToken } from '../../utils/auth';
+
+export type ImageViewerProps = {
+  alt: string;
+  src: string;
+  requestClose: () => void;
+};
+
+export const ImageViewer = as<'div', ImageViewerProps>(
+  ({ className, alt, src, requestClose, ...props }, ref) => {
+    const { zoom, zoomIn, zoomOut, setZoom } = useZoom(0.2);
+    const { pan, cursor, onMouseDown } = usePan(zoom !== 1);
+
+    const handleDownload = async () => {
+      try {
+        await downloadAndSaveMedia(src, alt, getCurrentAccessToken());
+      } catch (error) {
+        console.warn('[ImageViewer] Failed to download media:', error);
+        try {
+          window.open(src, '_blank');
+        } catch {
+          // ignore
+        }
+      }
+    };
+
+    return (
+      <Box
+        className={classNames(css.ImageViewer, className)}
+        direction="Column"
+        {...props}
+        ref={ref}
+      >
+        <Header className={css.ImageViewerHeader} size="400">
+          <Box grow="Yes" alignItems="Center" gap="200">
+            <IconButton size="300" radii="300" onClick={requestClose}>
+              <Icon size="50" src={Icons.ArrowLeft} />
+            </IconButton>
+            <Text size="T300" truncate>
+              {alt}
+            </Text>
+          </Box>
+          <Box shrink="No" alignItems="Center" gap="200">
+            <IconButton
+              variant={zoom < 1 ? 'Success' : 'SurfaceVariant'}
+              outlined={zoom < 1}
+              size="300"
+              radii="Pill"
+              onClick={zoomOut}
+              aria-label="Zoom Out"
+            >
+              <Icon size="50" src={Icons.Minus} />
+            </IconButton>
+            <Chip variant="SurfaceVariant" radii="Pill" onClick={() => setZoom(zoom === 1 ? 2 : 1)}>
+              <Text size="B300">{Math.round(zoom * 100)}%</Text>
+            </Chip>
+            <IconButton
+              variant={zoom > 1 ? 'Success' : 'SurfaceVariant'}
+              outlined={zoom > 1}
+              size="300"
+              radii="Pill"
+              onClick={zoomIn}
+              aria-label="Zoom In"
+            >
+              <Icon size="50" src={Icons.Plus} />
+            </IconButton>
+            <Chip
+              variant="Primary"
+              onClick={handleDownload}
+              radii="300"
+              before={<Icon size="50" src={Icons.Download} />}
+            >
+              <Text size="B300">Download</Text>
+            </Chip>
+          </Box>
+        </Header>
+        <Box
+          grow="Yes"
+          className={css.ImageViewerContent}
+          justifyContent="Center"
+          alignItems="Center"
+        >
+          <img
+            className={css.ImageViewerImg}
+            style={{
+              cursor,
+              transform: `scale(${zoom}) translate(${pan.translateX}px, ${pan.translateY}px)`,
+            }}
+            src={src}
+            alt={alt}
+            draggable={false}
+            onMouseDown={onMouseDown}
+          />
+        </Box>
+      </Box>
+    );
+  }
+);

overlay/src/app/components/message/FileHeader.tsx

@@ -0,0 +1,84 @@
+import { Badge, Box, IconButton, Spinner, Text, as, toRem } from 'folds';
+import { Icon, Icons } from '../icons';
+import React, { ReactNode, useCallback } from 'react';
+import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
+import { mimeTypeToExt } from '../../utils/mimeTypes';
+import { useMatrixClient } from '../../hooks/useMatrixClient';
+import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
+import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
+import {
+  decryptFile,
+  downloadEncryptedMedia,
+  downloadMedia,
+  mxcUrlToHttp,
+} from '../../utils/matrix';
+import { getCurrentAccessToken } from '../../utils/auth';
+import { saveMediaBlob } from '../../utils/saveMedia';
+
+const badgeStyles = { maxWidth: toRem(100) };
+
+type FileDownloadButtonProps = {
+  filename: string;
+  url: string;
+  mimeType: string;
+  encInfo?: EncryptedAttachmentInfo;
+};
+export function FileDownloadButton({ filename, url, mimeType, encInfo }: FileDownloadButtonProps) {
+  const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
+
+  const [downloadState, download] = useAsyncCallback(
+    useCallback(async () => {
+      const mediaUrl = mxcUrlToHttp(mx, url, useAuthentication) ?? url;
+      // Always use current session's token to avoid stale tokens during account switches
+      const accessToken = getCurrentAccessToken();
+      const fileContent = encInfo
+        ? await downloadEncryptedMedia(mediaUrl, (encBuf) => decryptFile(encBuf, mimeType, encInfo), accessToken)
+        : await downloadMedia(mediaUrl, accessToken);
+
+      await saveMediaBlob(fileContent, filename);
+      return true;
+    }, [mx, url, useAuthentication, mimeType, encInfo, filename])
+  );
+
+  const downloading = downloadState.status === AsyncStatus.Loading;
+  const hasError = downloadState.status === AsyncStatus.Error;
+  return (
+    <IconButton
+      disabled={downloading}
+      onClick={download}
+      variant={hasError ? 'Critical' : 'SurfaceVariant'}
+      size="300"
+      radii="300"
+    >
+      {downloading ? (
+        <Spinner size="100" variant={hasError ? 'Critical' : 'Secondary'} />
+      ) : (
+        <Icon size="100" src={Icons.Download} />
+      )}
+    </IconButton>
+  );
+}
+
+export type FileHeaderProps = {
+  body: string;
+  mimeType: string;
+  after?: ReactNode;
+};
+export const FileHeader = as<'div', FileHeaderProps>(({ body, mimeType, after, ...props }, ref) => (
+  <Box alignItems="Center" gap="200" grow="Yes" {...props} ref={ref}>
+    <Box shrink="No">
+      <Badge style={badgeStyles} variant="Secondary" radii="Pill">
+        <Text size="O400" truncate>
+          {mimeTypeToExt(mimeType)}
+        </Text>
+      </Badge>
+    </Box>
+    <Box grow="Yes">
+      <Text size="T300" truncate>
+        {body}
+      </Text>
+    </Box>
+    {after}
+  </Box>
+));

overlay/src/app/components/message/content/FileContent.tsx

@@ -0,0 +1,303 @@
+import React, { ReactNode, useCallback, useState } from 'react';
+import { Box, Button, Modal, Overlay, OverlayBackdrop, OverlayCenter, Spinner, Text, Tooltip, TooltipProvider, as } from 'folds';
+import { Icon, Icons } from '../../icons';
+import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
+import { saveMediaBlob } from '../../../utils/saveMedia';
+import FocusTrap from 'focus-trap-react';
+import { IFileInfo } from '../../../../types/matrix/common';
+import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
+import { useMatrixClient } from '../../../hooks/useMatrixClient';
+import { bytesToSize } from '../../../utils/common';
+import {
+  READABLE_EXT_TO_MIME_TYPE,
+  READABLE_TEXT_MIME_TYPES,
+  getFileNameExt,
+  mimeTypeToExt,
+} from '../../../utils/mimeTypes';
+import { stopPropagation } from '../../../utils/keyboard';
+import {
+  decryptFile,
+  downloadEncryptedMedia,
+  downloadMedia,
+  mxcUrlToHttp,
+} from '../../../utils/matrix';
+import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
+import { getCurrentAccessToken } from '../../../utils/auth';
+import { ModalWide } from '../../../styles/Modal.css';
+
+const renderErrorButton = (retry: () => void, text: string) => (
+  <TooltipProvider
+    tooltip={
+      <Tooltip variant="Critical">
+        <Text>Failed to load file!</Text>
+      </Tooltip>
+    }
+    position="Top"
+    align="Center"
+  >
+    {(triggerRef) => (
+      <Button
+        ref={triggerRef}
+        size="400"
+        variant="Critical"
+        fill="Soft"
+        outlined
+        radii="300"
+        onClick={retry}
+        before={<Icon size="100" src={Icons.Warning} filled />}
+      >
+        <Text size="B400" truncate>
+          {text}
+        </Text>
+      </Button>
+    )}
+  </TooltipProvider>
+);
+
+type RenderTextViewerProps = {
+  name: string;
+  text: string;
+  langName: string;
+  requestClose: () => void;
+};
+type ReadTextFileProps = {
+  body: string;
+  mimeType: string;
+  url: string;
+  encInfo?: EncryptedAttachmentInfo;
+  renderViewer: (props: RenderTextViewerProps) => ReactNode;
+};
+export function ReadTextFile({ body, mimeType, url, encInfo, renderViewer }: ReadTextFileProps) {
+  const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
+  const [textViewer, setTextViewer] = useState(false);
+
+  const [textState, loadText] = useAsyncCallback(
+    useCallback(async () => {
+      const mediaUrl = mxcUrlToHttp(mx, url, useAuthentication) ?? url;
+      // Always use current session's token to avoid stale tokens during account switches
+      const accessToken = getCurrentAccessToken();
+      const fileContent = encInfo
+        ? await downloadEncryptedMedia(mediaUrl, (encBuf) => decryptFile(encBuf, mimeType, encInfo), accessToken)
+        : await downloadMedia(mediaUrl, accessToken);
+
+      const text = fileContent.text();
+      setTextViewer(true);
+      return text;
+    }, [mx, useAuthentication, mimeType, encInfo, url])
+  );
+
+  return (
+    <>
+      {textState.status === AsyncStatus.Success && (
+        <Overlay open={textViewer} backdrop={<OverlayBackdrop />}>
+          <OverlayCenter>
+            <FocusTrap
+              focusTrapOptions={{
+                initialFocus: false,
+                onDeactivate: () => setTextViewer(false),
+                clickOutsideDeactivates: true,
+                escapeDeactivates: stopPropagation,
+              }}
+            >
+              <Modal
+                className={ModalWide}
+                size="500"
+                onContextMenu={(evt: any) => evt.stopPropagation()}
+              >
+                {renderViewer({
+                  name: body,
+                  text: textState.data,
+                  langName: READABLE_TEXT_MIME_TYPES.includes(mimeType)
+                    ? mimeTypeToExt(mimeType)
+                    : mimeTypeToExt(READABLE_EXT_TO_MIME_TYPE[getFileNameExt(body)] ?? mimeType),
+                  requestClose: () => setTextViewer(false),
+                })}
+              </Modal>
+            </FocusTrap>
+          </OverlayCenter>
+        </Overlay>
+      )}
+      {textState.status === AsyncStatus.Error ? (
+        renderErrorButton(loadText, 'Open File')
+      ) : (
+        <Button
+          variant="Secondary"
+          fill="Solid"
+          radii="300"
+          size="400"
+          onClick={() =>
+            textState.status === AsyncStatus.Success ? setTextViewer(true) : loadText()
+          }
+          disabled={textState.status === AsyncStatus.Loading}
+          before={
+            textState.status === AsyncStatus.Loading ? (
+              <Spinner fill="Solid" size="100" variant="Secondary" />
+            ) : (
+              <Icon size="100" src={Icons.ArrowRight} filled />
+            )
+          }
+        >
+          <Text size="B400" truncate>
+            Open File
+          </Text>
+        </Button>
+      )}
+    </>
+  );
+}
+
+type RenderPdfViewerProps = {
+  name: string;
+  src: string;
+  requestClose: () => void;
+};
+export type ReadPdfFileProps = {
+  body: string;
+  mimeType: string;
+  url: string;
+  encInfo?: EncryptedAttachmentInfo;
+  renderViewer: (props: RenderPdfViewerProps) => ReactNode;
+};
+export function ReadPdfFile({ body, mimeType, url, encInfo, renderViewer }: ReadPdfFileProps) {
+  const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
+  const [pdfViewer, setPdfViewer] = useState(false);
+
+  const [pdfState, loadPdf] = useAsyncCallback(
+    useCallback(async () => {
+      const mediaUrl = mxcUrlToHttp(mx, url, useAuthentication) ?? url;
+      // Always use current session's token to avoid stale tokens during account switches
+      const accessToken = getCurrentAccessToken();
+      const fileContent = encInfo
+        ? await downloadEncryptedMedia(mediaUrl, (encBuf) => decryptFile(encBuf, mimeType, encInfo), accessToken)
+        : await downloadMedia(mediaUrl, accessToken);
+      setPdfViewer(true);
+      return URL.createObjectURL(fileContent);
+    }, [mx, url, useAuthentication, mimeType, encInfo])
+  );
+
+  return (
+    <>
+      {pdfState.status === AsyncStatus.Success && (
+        <Overlay open={pdfViewer} backdrop={<OverlayBackdrop />}>
+          <OverlayCenter>
+            <FocusTrap
+              focusTrapOptions={{
+                initialFocus: false,
+                onDeactivate: () => setPdfViewer(false),
+                clickOutsideDeactivates: true,
+                escapeDeactivates: stopPropagation,
+              }}
+            >
+              <Modal
+                className={ModalWide}
+                size="500"
+                onContextMenu={(evt: any) => evt.stopPropagation()}
+              >
+                {renderViewer({
+                  name: body,
+                  src: pdfState.data,
+                  requestClose: () => setPdfViewer(false),
+                })}
+              </Modal>
+            </FocusTrap>
+          </OverlayCenter>
+        </Overlay>
+      )}
+      {pdfState.status === AsyncStatus.Error ? (
+        renderErrorButton(loadPdf, 'Open PDF')
+      ) : (
+        <Button
+          variant="Secondary"
+          fill="Solid"
+          radii="300"
+          size="400"
+          onClick={() => (pdfState.status === AsyncStatus.Success ? setPdfViewer(true) : loadPdf())}
+          disabled={pdfState.status === AsyncStatus.Loading}
+          before={
+            pdfState.status === AsyncStatus.Loading ? (
+              <Spinner fill="Solid" size="100" variant="Secondary" />
+            ) : (
+              <Icon size="100" src={Icons.ArrowRight} filled />
+            )
+          }
+        >
+          <Text size="B400" truncate>
+            Open PDF
+          </Text>
+        </Button>
+      )}
+    </>
+  );
+}
+
+export type DownloadFileProps = {
+  body: string;
+  mimeType: string;
+  url: string;
+  info: IFileInfo;
+  encInfo?: EncryptedAttachmentInfo;
+};
+export function DownloadFile({ body, mimeType, url, info, encInfo }: DownloadFileProps) {
+  const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
+
+  const [downloadState, download] = useAsyncCallback(
+    useCallback(async () => {
+      const mediaUrl = mxcUrlToHttp(mx, url, useAuthentication) ?? url;
+      // Always use current session's token to avoid stale tokens during account switches
+      const accessToken = getCurrentAccessToken();
+      const fileContent = encInfo
+        ? await downloadEncryptedMedia(mediaUrl, (encBuf) => decryptFile(encBuf, mimeType, encInfo), accessToken)
+        : await downloadMedia(mediaUrl, accessToken);
+
+      await saveMediaBlob(fileContent, body);
+      return fileContent;
+    }, [mx, url, useAuthentication, mimeType, encInfo, body])
+  );
+
+  return downloadState.status === AsyncStatus.Error ? (
+    renderErrorButton(download, `Retry Download (${bytesToSize(info.size ?? 0)})`)
+  ) : (
+    <Button
+      variant="Secondary"
+      fill="Soft"
+      radii="300"
+      size="400"
+      onClick={() =>
+        downloadState.status === AsyncStatus.Success
+          ? saveMediaBlob(downloadState.data, body)
+          : download()
+      }
+      disabled={downloadState.status === AsyncStatus.Loading}
+      before={
+        downloadState.status === AsyncStatus.Loading ? (
+          <Spinner fill="Soft" size="100" variant="Secondary" />
+        ) : (
+          <Icon size="100" src={Icons.Download} filled />
+        )
+      }
+    >
+      <Text size="B400" truncate>{`Download (${bytesToSize(info.size ?? 0)})`}</Text>
+    </Button>
+  );
+}
+
+type FileContentProps = {
+  body: string;
+  mimeType: string;
+  renderAsTextFile: () => ReactNode;
+  renderAsPdfFile: () => ReactNode;
+};
+export const FileContent = as<'div', FileContentProps>(
+  ({ body, mimeType, renderAsTextFile, renderAsPdfFile, children, ...props }, ref) => (
+    <Box direction="Column" gap="300" {...props} ref={ref}>
+      {(READABLE_TEXT_MIME_TYPES.includes(mimeType) ||
+        READABLE_EXT_TO_MIME_TYPE[getFileNameExt(body)]) &&
+        renderAsTextFile()}
+      {mimeType === 'application/pdf' && renderAsPdfFile()}
+      {children}
+    </Box>
+  )
+);

overlay/src/app/components/video-viewer/VideoViewer.tsx

@@ -0,0 +1,74 @@
+import React from 'react';
+import classNames from 'classnames';
+import { Box, Chip, Header, IconButton, Text, as } from 'folds';
+import { Icon, Icons } from '../icons';
+import * as css from './VideoViewer.css';
+import { downloadAndSaveMedia } from '../../utils/saveMedia';
+import { getCurrentAccessToken } from '../../utils/auth';
+
+export type VideoViewerProps = {
+  alt: string;
+  src: string;
+  requestClose: () => void;
+};
+
+export const VideoViewer = as<'div', VideoViewerProps>(
+  ({ className, alt, src, requestClose, ...props }, ref) => {
+    const handleDownload = async () => {
+      try {
+        await downloadAndSaveMedia(src, alt, getCurrentAccessToken());
+      } catch (error) {
+        console.warn('[VideoViewer] Failed to download media:', error);
+        try {
+          window.open(src, '_blank');
+        } catch {
+          // ignore
+        }
+      }
+    };
+
+    return (
+      <Box
+        className={classNames(css.VideoViewer, className)}
+        direction="Column"
+        {...props}
+        ref={ref}
+      >
+        <Header className={css.VideoViewerHeader} size="400">
+          <Box grow="Yes" alignItems="Center" gap="200">
+            <IconButton size="300" radii="300" onClick={requestClose}>
+              <Icon size="50" src={Icons.ArrowLeft} />
+            </IconButton>
+            <Text size="T300" truncate>
+              {alt}
+            </Text>
+          </Box>
+          <Box shrink="No" alignItems="Center" gap="200">
+            <Chip
+              variant="Primary"
+              onClick={handleDownload}
+              radii="300"
+              before={<Icon size="50" src={Icons.Download} />}
+            >
+              <Text size="B300">Download</Text>
+            </Chip>
+          </Box>
+        </Header>
+        <Box
+          grow="Yes"
+          className={css.VideoViewerContent}
+          justifyContent="Center"
+          alignItems="Center"
+        >
+          <video
+            className={css.VideoViewerVideo}
+            src={src}
+            title={alt}
+            controls
+            autoPlay
+          />
+        </Box>
+      </Box>
+    );
+  }
+);

overlay/src/app/pages/client/ClientNonUIFeatures.tsx

@@ -29,6 +29,8 @@ import {
   getCanonicalAliasOrRoomId,
   encryptFile,
   downloadMedia,
+  downloadEncryptedMedia,
+  decryptFile,
 } from '../../utils/matrix';
 import { mDirectAtom } from '../../state/mDirectList';
 import { roomToParentsAtom } from '../../state/room/roomToParents';
@@ -140,6 +142,15 @@ async function mediaUrlToBase64(
 ): Promise<string | undefined> {
   try {
     const blob = await downloadMedia(url, accessToken);
+    return blobToBase64(blob);
+  } catch (err) {
+    console.warn('[Notifications] Failed to fetch media for notification:', err);
+    return undefined;
+  }
+}
+
+async function blobToBase64(blob: Blob): Promise<string | undefined> {
+  try {
     const buffer = await blob.arrayBuffer();
     const bytes = new Uint8Array(buffer);
     let binary = '';
@@ -149,12 +160,73 @@ async function mediaUrlToBase64(
     }
     const mime = blob.type || 'image/jpeg';
     return `data:${mime};base64,${btoa(binary)}`;
-  } catch (err) {
+  } catch {
-    console.warn('[Notifications] Failed to fetch avatar for notification icon:', err);
     return undefined;
   }
 }
 
+/** Resolve a sender display name from room membership, user directory, then MXID. */
+function resolveSenderDisplayName(mx: MatrixClient, room: { roomId: string }, sender: string): string {
+  return (
+    getMemberDisplayName(room as any, sender) ??
+    mx.getUser(sender)?.displayName ??
+    getMxIdLocalPart(sender) ??
+    sender
+  );
+}
+
+/** Fetch image attachment preview (plaintext or encrypted) for the notification shade. */
+async function fetchNotificationImageBase64(
+  mx: MatrixClient,
+  mEvent: MatrixEvent,
+  useAuthentication: boolean
+): Promise<string | undefined> {
+  const content = (mEvent.getClearContent() ?? mEvent.getContent()) as Record<string, any>;
+  if (content.msgtype !== 'm.image' && mEvent.getType() !== 'm.sticker') return undefined;
+
+  const accessToken = mx.getAccessToken();
+  const info = content.info ?? {};
+
+  try {
+    // Prefer a smaller thumbnail when available.
+    if (info.thumbnail_file?.url) {
+      const mediaUrl =
+        mxcUrlToHttp(mx, info.thumbnail_file.url, useAuthentication) ?? info.thumbnail_file.url;
+      const blob = await downloadEncryptedMedia(
+        mediaUrl,
+        (encBuf) =>
+          decryptFile(encBuf, info.thumbnail_info?.mimetype ?? 'image/jpeg', info.thumbnail_file),
+        accessToken
+      );
+      return blobToBase64(blob);
+    }
+    if (typeof info.thumbnail_url === 'string') {
+      const mediaUrl =
+        mxcUrlToHttp(mx, info.thumbnail_url, useAuthentication, 512, 512, 'scale') ??
+        mxcUrlToHttp(mx, info.thumbnail_url, useAuthentication);
+      if (mediaUrl) return mediaUrlToBase64(mediaUrl, accessToken);
+    }
+    if (content.file?.url) {
+      const mediaUrl = mxcUrlToHttp(mx, content.file.url, useAuthentication) ?? content.file.url;
+      const blob = await downloadEncryptedMedia(
+        mediaUrl,
+        (encBuf) => decryptFile(encBuf, info.mimetype ?? 'image/jpeg', content.file),
+        accessToken
+      );
+      return blobToBase64(blob);
+    }
+    if (typeof content.url === 'string') {
+      const mediaUrl =
+        mxcUrlToHttp(mx, content.url, useAuthentication, 512, 512, 'scale') ??
+        mxcUrlToHttp(mx, content.url, useAuthentication);
+      if (mediaUrl) return mediaUrlToBase64(mediaUrl, accessToken);
+    }
+  } catch (err) {
+    console.warn('[Notifications] Failed to fetch image attachment for notification:', err);
+  }
+  return undefined;
+}
+
 /**
  * Applies the selected emoji style font to the document.
  * - System: Uses the native OS emoji font
@@ -319,23 +391,64 @@ function MessageNotifications() {
 
   // Set up notification tap listener for mobile
   useEffect(() => {
-    setupNotificationTapListener((path) => {
+    const openFromNotification = (target: string) => {
-      navigate(path);
+      if (!target) return;
-    });
+
-  }, [navigate]);
+      if (target.startsWith('__room__:')) {
+        const roomId = target.slice('__room__:'.length);
+        if (!mx || !roomId) return;
+        try {
+          const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, roomId);
+          if (mDirects.has(roomId)) {
+            navigate(getDirectRoomPath(roomIdOrAlias));
+            return;
+          }
+          const orphanParents = getOrphanParents(roomToParents, roomId);
+          if (orphanParents.length > 0) {
+            const parentSpace = guessPerfectParent(mx, roomId, orphanParents) ?? orphanParents[0];
+            const pSpaceIdOrAlias = getCanonicalAliasOrRoomId(mx, parentSpace);
+            navigate(getSpaceRoomPath(pSpaceIdOrAlias, roomIdOrAlias));
+            return;
+          }
+          navigate(getHomeRoomPath(roomIdOrAlias));
+        } catch (err) {
+          console.error('[Notifications] Navigate from roomId error:', err);
+        }
+        return;
+      }
+
+      navigate(target);
+    };
+
+    setupNotificationTapListener(openFromNotification);
+  }, [navigate, mx, mDirects, roomToParents]);
 
   const roomToUnread = useAtomValue(roomToUnreadAtom);
   const previousUnreadRoomsRef = useRef<Set<string>>(new Set());
+  const previousUnreadTotalsRef = useRef<Map<string, number>>(new Map());
 
-  // Dismiss OS notifications when a room's unread is cleared (local read or receipt).
+  // Dismiss OS notifications when a room's unread is cleared
+  // (local mark-as-read, or our receipt syncing from another device).
   useEffect(() => {
     const currentRooms = new Set(roomToUnread.keys());
+    const nextTotals = new Map<string, number>();
+
+    roomToUnread.forEach((unread, roomId) => {
+      nextTotals.set(roomId, unread.total);
+      const prevTotal = previousUnreadTotalsRef.current.get(roomId);
+      if (prevTotal !== undefined && prevTotal > 0 && unread.total === 0) {
+        void clearNotificationsForRoom(roomId);
+      }
+    });
+
     for (const roomId of previousUnreadRoomsRef.current) {
       if (!currentRooms.has(roomId)) {
         void clearNotificationsForRoom(roomId);
       }
     }
+
     previousUnreadRoomsRef.current = currentRooms;
+    previousUnreadTotalsRef.current = nextTotals;
   }, [roomToUnread]);
 
   const notify = useCallback(
@@ -343,6 +456,7 @@ function MessageNotifications() {
       roomName,
       roomAvatar,
       iconBase64,
+      bigPictureBase64,
       username,
       messageBody,
       roomId,
@@ -352,6 +466,7 @@ function MessageNotifications() {
       roomName: string;
       roomAvatar?: string;
       iconBase64?: string;
+      bigPictureBase64?: string;
       username: string;
       messageBody?: string;
       roomId: string;
@@ -394,6 +509,8 @@ function MessageNotifications() {
         : messageBody
           ? `${username}: ${messageBody}`
           : `${username} sent a message`;
+      const messageText = messageBody || 'New message';
+      const conversationTitle = isDm ? undefined : roomName || undefined;
 
       /** Replicates TitleBar click navigation logic */
       const navigateToRoom = () => {
@@ -438,11 +555,15 @@ function MessageNotifications() {
         sendNotification({
           title: notificationTitle,
           body: notificationBody,
+          senderName: username,
+          messageText,
+          conversationTitle,
           path: roomPath,
           roomId,
           group,
           icon: roomAvatar,
           iconBase64,
+          bigPictureBase64,
           onClick: () => {
             if (!window.closed) navigate(roomPath);
           },
@@ -551,10 +672,16 @@ function MessageNotifications() {
             ? mxcUrlToHttp(mx, avatarMxc, useAuthentication, 96, 96, 'crop') ?? undefined
             : undefined;
 
-          let iconBase64: string | undefined;
+          const username = resolveSenderDisplayName(mx, room, sender);
-          if (roomAvatar && isCapacitorNative()) {
+
-            iconBase64 = await mediaUrlToBase64(roomAvatar, mx.getAccessToken());
+          const [iconBase64, bigPictureBase64] = await Promise.all([
-          }
+            roomAvatar && isCapacitorNative()
+              ? mediaUrlToBase64(roomAvatar, mx.getAccessToken())
+              : Promise.resolve(undefined),
+            isCapacitorNative()
+              ? fetchNotificationImageBase64(mx, mEvent, useAuthentication)
+              : Promise.resolve(undefined),
+          ]);
 
           const messageBody = notificationBodyFromEvent(mEvent);
 
@@ -562,7 +689,8 @@ function MessageNotifications() {
             roomName: room.name ?? 'Unknown',
             roomAvatar,
             iconBase64,
-            username: getMemberDisplayName(room, sender) ?? getMxIdLocalPart(sender) ?? sender,
+            bigPictureBase64,
+            username,
             messageBody,
             roomId: room.roomId,
             eventId,

overlay/src/app/utils/androidShare.ts

@@ -21,6 +21,18 @@ interface AndroidShareHandlerPlugin {
   getPendingShare(): Promise<{ share: AndroidSharePayload | null }>;
   /** Clears the last pending share payload after it has been consumed. */
   clearPendingShare(): Promise<void>;
+  /** Save a base64 file to gallery / Downloads (MediaStore), or share-sheet fallback. */
+  saveFile(options: {
+    filename: string;
+    mimeType?: string;
+    base64: string;
+  }): Promise<{ saved: boolean; shared?: boolean; uri?: string }>;
+  /** Open the system share sheet for a base64 file. */
+  shareFile(options: {
+    filename: string;
+    mimeType?: string;
+    base64: string;
+  }): Promise<{ shared: boolean }>;
   addListener(
     eventName: 'shareReceived',
     listenerFunc: (payload: AndroidSharePayload) => void

overlay/src/app/utils/backgroundSync.ts

@@ -66,14 +66,25 @@ interface MatrixBackgroundSyncPlugin {
   }): Promise<{ success: boolean }>;
   /** Post a message notification with optional avatar (base64) from the JS layer. */
   showNotification(options: {
-    title: string;
+    title?: string;
-    body: string;
+    body?: string;
+    senderName?: string;
+    messageText?: string;
+    conversationTitle?: string;
+    path?: string;
     roomId: string;
     groupId: string;
     groupName: string;
     kind: string;
     largeIconBase64?: string;
+    bigPictureBase64?: string;
   }): Promise<{ shown: boolean }>;
+  /** Pending navigation target from a native notification tap. */
+  getPendingNotificationNav(): Promise<{ path?: string | null; roomId?: string | null }>;
+  addListener(
+    eventName: 'notificationOpened',
+    listenerFunc: (event: { path?: string; roomId?: string }) => void
+  ): Promise<PluginListenerHandle>;
   addListener(
     eventName: 'unifiedPushNewEndpoint',
     listenerFunc: (event: UnifiedPushEndpointEvent) => void
@@ -580,13 +591,18 @@ export const syncNotificationGroupMap = async (
  * Prefer this over Capacitor LocalNotifications on Android.
  */
 export const showNativeNotification = async (options: {
-  title: string;
+  title?: string;
-  body: string;
+  body?: string;
+  senderName?: string;
+  messageText?: string;
+  conversationTitle?: string;
+  path?: string;
   roomId: string;
   groupId: string;
   groupName: string;
   kind: string;
   largeIconBase64?: string;
+  bigPictureBase64?: string;
 }): Promise<boolean> => {
   if (!isBackgroundSyncSupported()) return false;
 
@@ -598,3 +614,30 @@ export const showNativeNotification = async (options: {
     return false;
   }
 };
+
+/** Consume a pending native notification navigation target, if any. */
+export const getPendingNotificationNav = async (): Promise<{
+  path?: string | null;
+  roomId?: string | null;
+}> => {
+  if (!isBackgroundSyncSupported()) return {};
+  try {
+    return await MatrixBackgroundSync.getPendingNotificationNav();
+  } catch (err) {
+    console.warn('[BackgroundSync] getPendingNotificationNav failed:', err);
+    return {};
+  }
+};
+
+/** Subscribe to native notification taps that open the app. */
+export const listenForNotificationOpens = async (
+  listener: (event: { path?: string; roomId?: string }) => void
+): Promise<PluginListenerHandle | undefined> => {
+  if (!isBackgroundSyncSupported()) return undefined;
+  try {
+    return await MatrixBackgroundSync.addListener('notificationOpened', listener);
+  } catch (err) {
+    console.warn('[BackgroundSync] notificationOpened listener failed:', err);
+    return undefined;
+  }
+};

overlay/src/app/utils/saveMedia.ts

@@ -0,0 +1,103 @@
+import FileSaver from 'file-saver';
+import { Capacitor, registerPlugin } from '@capacitor/core';
+import { downloadMedia } from './matrix';
+import { getCurrentAccessToken } from './auth';
+
+interface AndroidShareHandlerSavePlugin {
+  saveFile(options: {
+    filename: string;
+    mimeType?: string;
+    base64: string;
+  }): Promise<{ saved: boolean; shared?: boolean; uri?: string }>;
+  shareFile(options: {
+    filename: string;
+    mimeType?: string;
+    base64: string;
+  }): Promise<{ shared: boolean }>;
+}
+
+const AndroidShareHandler = registerPlugin<AndroidShareHandlerSavePlugin>('AndroidShareHandler');
+
+const isAndroidNative = (): boolean =>
+  Capacitor.isNativePlatform() && Capacitor.getPlatform() === 'android';
+
+/** Convert a Blob to raw base64 (no data: prefix). */
+const blobToBase64 = (blob: Blob): Promise<string> =>
+  new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = () => {
+      const result = reader.result;
+      if (typeof result !== 'string') {
+        reject(new Error('Failed to read blob as base64'));
+        return;
+      }
+      resolve(result.includes(',') ? result.split(',')[1] : result);
+    };
+    reader.onerror = () => reject(reader.error ?? new Error('FileReader failed'));
+    reader.readAsDataURL(blob);
+  });
+
+const guessMimeFromName = (filename: string): string | undefined => {
+  const ext = filename.split('.').pop()?.toLowerCase();
+  if (!ext) return undefined;
+  const map: Record<string, string> = {
+    jpg: 'image/jpeg',
+    jpeg: 'image/jpeg',
+    png: 'image/png',
+    gif: 'image/gif',
+    webp: 'image/webp',
+    bmp: 'image/bmp',
+    svg: 'image/svg+xml',
+    mp4: 'video/mp4',
+    webm: 'video/webm',
+    mkv: 'video/x-matroska',
+    mov: 'video/quicktime',
+    mp3: 'audio/mpeg',
+    ogg: 'audio/ogg',
+    wav: 'audio/wav',
+    pdf: 'application/pdf',
+    txt: 'text/plain',
+  };
+  return map[ext];
+};
+
+/**
+ * Persist a Blob to disk. On Capacitor Android, uses MediaStore via the native
+ * ShareHandler plugin (FileSaver / `<a download>` does not work in WebView).
+ * Elsewhere falls back to FileSaver.
+ */
+export const saveMediaBlob = async (blob: Blob, filename: string): Promise<void> => {
+  if (isAndroidNative()) {
+    const base64 = await blobToBase64(blob);
+    const mimeType = blob.type || guessMimeFromName(filename) || 'application/octet-stream';
+    await AndroidShareHandler.saveFile({ filename, mimeType, base64 });
+    return;
+  }
+  FileSaver.saveAs(blob, filename);
+};
+
+/**
+ * Fetch media (auth download or blob:/http URL) and save it via [saveMediaBlob].
+ */
+export const downloadAndSaveMedia = async (
+  src: string,
+  filename: string,
+  accessToken?: string | null
+): Promise<void> => {
+  let blob: Blob;
+  try {
+    if (src.startsWith('blob:') || src.startsWith('data:')) {
+      const res = await fetch(src);
+      if (!res.ok) throw new Error(`Failed to fetch ${src}`);
+      blob = await res.blob();
+    } else {
+      blob = await downloadMedia(src, accessToken ?? getCurrentAccessToken());
+    }
+  } catch (error) {
+    console.warn('[saveMedia] downloadMedia failed, trying fetch fallback:', error);
+    const res = await fetch(src);
+    if (!res.ok) throw error;
+    blob = await res.blob();
+  }
+  await saveMediaBlob(blob, filename);
+};

overlay/src/app/utils/tauri.ts

@@ -207,6 +207,36 @@ export const setupNotificationTapListener = async (onTap: (path: string) => void
     } catch (err) {
       console.warn('Failed to set up Capacitor notification tap listener:', err);
     }
+
+    // Native NotificationManager posts (MatrixBackgroundSync.showNotification) open the
+    // Activity with extras — LocalNotifications never sees those taps.
+    try {
+      const {
+        getPendingNotificationNav,
+        listenForNotificationOpens,
+      } = await import('./backgroundSync');
+
+      const deliver = (path?: string | null, roomId?: string | null) => {
+        if (path && notificationTapCallback) {
+          notificationTapCallback(path);
+          return;
+        }
+        if (roomId && notificationTapCallback) {
+          // Encode a synthetic marker path that ClientNonUIFeatures can resolve.
+          notificationTapCallback(`__room__:${roomId}`);
+        }
+      };
+
+      const pending = await getPendingNotificationNav();
+      deliver(pending.path, pending.roomId);
+
+      await listenForNotificationOpens((event) => {
+        void focusWindow();
+        deliver(event.path, event.roomId);
+      });
+    } catch (err) {
+      console.warn('Failed to set up native notification open listener:', err);
+    }
   }
 };
 
@@ -633,12 +663,29 @@ export const sendNotification = async (options: {
   body: string;
   icon?: string;
   iconBase64?: string;
+  bigPictureBase64?: string;
+  senderName?: string;
+  messageText?: string;
+  conversationTitle?: string;
   path?: string;
   roomId?: string;
   group?: NotificationGroupInfo;
   onClick?: () => void;
 }): Promise<void> => {
-  const { title, body, icon, iconBase64, path, roomId, group, onClick } = options;
+  const {
+    title,
+    body,
+    icon,
+    iconBase64,
+    bigPictureBase64,
+    senderName,
+    messageText,
+    conversationTitle,
+    path,
+    roomId,
+    group,
+    onClick,
+  } = options;
   const extra = {
     ...(path ? { path } : {}),
     ...(roomId ? { roomId } : {}),
@@ -726,11 +773,16 @@ export const sendNotification = async (options: {
         const shown = await showNativeNotification({
           title,
           body,
+          senderName: senderName ?? title,
+          messageText: messageText ?? body,
+          conversationTitle,
+          path,
           roomId,
           groupId,
           groupName,
           kind: group.kind,
           largeIconBase64: iconBase64,
+          bigPictureBase64,
         });
         if (shown) return;
       } catch (err) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paarrot",
-  "version": "4.11.135",
+  "version": "4.11.139",
   "description": "Paarrot - A Matrix client based on Cinny",
   "engines": {
     "node": ">=18.0.0"