Changes before error encountered

Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Android/sessions/664eeab0-1c2d-4734-bc3f-525fa98c969f

Author: Copilot

core/service/src/androidHostTest/kotlin/org/meshtastic/core/service/MeshNotificationManagerImplConversationTest.kt

@@ -19,6 +19,7 @@ package org.meshtastic.core.service
 import android.app.Notification
 import android.app.NotificationManager
 import android.content.Context
+import androidx.core.app.NotificationCompat
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import dev.mokkery.MockMode
@@ -37,6 +38,7 @@ import org.meshtastic.core.model.ConnectionState
 import org.meshtastic.core.model.Message
 import org.meshtastic.core.model.MyNodeInfo
 import org.meshtastic.core.model.Node
+import org.meshtastic.core.model.Reaction
 import org.meshtastic.core.repository.NodeRepository
 import org.meshtastic.core.repository.PacketRepository
 import org.meshtastic.core.repository.RadioConfigRepository
@@ -102,7 +104,22 @@ class MeshNotificationManagerImplConversationTest {
         everySuspend { packetRepository.getMessagesFrom(any(), any(), any(), any()) } returns flowOf(messages.toList())
     }
 
-    private fun message(text: String, read: Boolean, receivedTime: Long): Message = Message(
+    private fun reaction(emoji: String, timestamp: Long): Reaction = Reaction(
+        replyId = 0,
+        user = sender.user,
+        emoji = emoji,
+        timestamp = timestamp,
+        snr = 0f,
+        rssi = 0,
+        hopsAway = 0,
+    )
+
+    private fun message(
+        text: String,
+        read: Boolean,
+        receivedTime: Long,
+        emojis: List<Reaction> = emptyList(),
+    ): Message = Message(
         uuid = receivedTime,
         receivedTime = receivedTime,
         node = sender,
@@ -113,7 +130,7 @@ class MeshNotificationManagerImplConversationTest {
         status = null,
         routingError = 0,
         packetId = receivedTime.toInt(),
-        emojis = emptyList(),
+        emojis = emojis,
         snr = 0f,
         rssi = 0,
         hopsAway = 0,
@@ -142,7 +159,7 @@ class MeshNotificationManagerImplConversationTest {
     fun `read messages become historic context and unread messages stay alerting`() = runTest {
         mockHistory(
             message("new unread", read = false, receivedTime = 3_000),
-            message("older read 2", read = true, receivedTime = 2_000),
+            message("older read 2", read = true, receivedTime = 2_000, emojis = listOf(reaction("👍", 2_100))),
             message("older read 1", read = true, receivedTime = 1_000),
         )
 
@@ -158,7 +175,7 @@ class MeshNotificationManagerImplConversationTest {
         val alerting = posted.extras.getParcelableArray(Notification.EXTRA_MESSAGES)
         val historic = posted.extras.getParcelableArray(Notification.EXTRA_HISTORIC_MESSAGES)
         assertEquals(1, alerting?.size, "only the unread message should be presented as new content")
-        assertEquals(2, historic?.size, "read context should be carried as historic messages")
+        assertEquals(3, historic?.size, "read context and its reactions should be carried as historic messages")
         assertEquals("new unread", posted.extras.getCharSequence(Notification.EXTRA_TEXT)?.toString())
     }
 
@@ -170,6 +187,11 @@ class MeshNotificationManagerImplConversationTest {
 
         val summary = activeByTag("message_summary").single().notification
         assertEquals(Notification.GROUP_ALERT_CHILDREN, summary.groupAlertBehavior)
+        val summaryMessage =
+            NotificationCompat.MessagingStyle.Message
+                .getMessagesFromBundleArray(summary.extras.getParcelableArray(Notification.EXTRA_MESSAGES))
+                .single()
+        assertEquals("Hawk Ridge", summaryMessage.person?.name)
 
         manager.cancelMessageNotification("0^all")
 

core/service/src/androidMain/kotlin/org/meshtastic/core/service/MeshNotificationManagerImpl.kt

@@ -523,14 +523,16 @@ class MeshNotificationManagerImpl(
                 .setConversationTitle(getString(Res.string.meshtastic_app_name))
 
         activeNotifications.forEach { sbn ->
-            val senderTitle = sbn.notification.extras.getCharSequence(Notification.EXTRA_TITLE)
-            val messageText = sbn.notification.extras.getCharSequence(Notification.EXTRA_TEXT)
-            val postTime = sbn.postTime
-
-            if (senderTitle != null && messageText != null) {
-                // For the summary, we're creating a generic Person for the sender from the active notification's title.
-                // We don't have the original Person object or its colors/ID, so we're just using the name.
-                val senderPerson = Person.Builder().setName(senderTitle).build()
+            val latestMessage =
+                NotificationCompat.MessagingStyle.Message
+                    .getMessagesFromBundleArray(sbn.notification.extras.getParcelableArray(Notification.EXTRA_MESSAGES))
+                    .lastOrNull()
+            val senderName = latestMessage?.person?.name
+            val messageText = latestMessage?.text
+            val postTime = latestMessage?.timestamp
+
+            if (senderName != null && messageText != null && postTime != null) {
+                val senderPerson = Person.Builder().setName(senderName).build()
                 messagingStyle.addMessage(messageText, postTime, senderPerson)
             }
         }
@@ -705,7 +707,8 @@ class MeshNotificationManagerImpl(
                     "↩️ \"${original.node.user.short_name}: ${original.text.take(SNIPPET_LENGTH)}...\": ${msg.text}"
                 } ?: msg.text
 
-            if (msg.read && (anyUnread || index != lastIndex)) {
+            val isHistoricContext = msg.read && (anyUnread || index != lastIndex)
+            if (isHistoricContext) {
                 style.addHistoricMessage(NotificationCompat.MessagingStyle.Message(text, msg.receivedTime, person))
             } else {
                 style.addMessage(text, msg.receivedTime, person)
@@ -727,11 +730,17 @@ class MeshNotificationManagerImpl(
                             ),
                         )
                         .build()
-                style.addMessage(
-                    "${reaction.emoji} to \"${msg.text.take(SNIPPET_LENGTH)}...\"",
-                    reaction.timestamp,
-                    reactor,
-                )
+                val reactionMessage =
+                    NotificationCompat.MessagingStyle.Message(
+                        "${reaction.emoji} to \"${msg.text.take(SNIPPET_LENGTH)}...\"",
+                        reaction.timestamp,
+                        reactor,
+                    )
+                if (isHistoricContext) {
+                    style.addHistoricMessage(reactionMessage)
+                } else {
+                    style.addMessage(reactionMessage)
+                }
             }
         }
         val lastMessage = history.last()