When replying from notification, do not interfere with specialModeEventTimelineItem

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/textcomposer/MessageComposerPresenterTest.kt

@@ -395,7 +395,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - reply message`() = runTest {
-        val replyMessageLambda = lambdaRecorder { _: EventId, _: String, _: String?, _: List<Mention> ->
+        val replyMessageLambda = lambdaRecorder { _: EventId, _: String, _: String?, _: List<Mention>, _: Boolean ->
             Result.success(Unit)
         }
         val timeline = FakeTimeline().apply {
@@ -909,7 +909,7 @@ class MessageComposerPresenterTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `present - send messages with intentional mentions`() = runTest {
-        val replyMessageLambda = lambdaRecorder { _: EventId, _: String, _: String?, _: List<Mention> ->
+        val replyMessageLambda = lambdaRecorder { _: EventId, _: String, _: String?, _: List<Mention>, _: Boolean ->
             Result.success(Unit)
         }
         val editMessageLambda = lambdaRecorder { _: EventId?, _: TransactionId?, _: String, _: String?, _: List<Mention> ->

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt

@@ -57,7 +57,13 @@ interface Timeline : AutoCloseable {
 
     suspend fun enterSpecialMode(eventId: EventId?): Result<Unit>
 
-    suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String?, mentions: List<Mention>): Result<Unit>
+    suspend fun replyMessage(
+        eventId: EventId,
+        body: String,
+        htmlBody: String?,
+        mentions: List<Mention>,
+        fromNotification: Boolean = false,
+    ): Result<Unit>
 
     suspend fun sendImage(
         file: File,

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt

@@ -308,13 +308,28 @@ class RustTimeline(
         }
     }
 
-    override suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String?, mentions: List<Mention>): Result<Unit> = withContext(dispatcher) {
+    override suspend fun replyMessage(
+        eventId: EventId,
+        body: String,
+        htmlBody: String?,
+        mentions: List<Mention>,
+        fromNotification: Boolean,
+    ): Result<Unit> = withContext(dispatcher) {
         runCatching {
-            val inReplyTo = specialModeEventTimelineItem ?: inner.getEventTimelineItemByEventId(eventId.value)
+            val msg = messageEventContentFromParts(body, htmlBody).withMentions(mentions.map())
-            inReplyTo.use { eventTimelineItem ->
+            if (fromNotification) {
-                inner.sendReply(messageEventContentFromParts(body, htmlBody).withMentions(mentions.map()), eventTimelineItem)
+                // When replying from a notification, do not interfere with `specialModeEventTimelineItem`
+                val inReplyTo = inner.getEventTimelineItemByEventId(eventId.value)
+                inReplyTo.use { eventTimelineItem ->
+                    inner.sendReply(msg, eventTimelineItem)
+                }
+            } else {
+                val inReplyTo = specialModeEventTimelineItem ?: inner.getEventTimelineItemByEventId(eventId.value)
+                inReplyTo.use { eventTimelineItem ->
+                    inner.sendReply(msg, eventTimelineItem)
+                }
+                specialModeEventTimelineItem = null
             }
-            specialModeEventTimelineItem = null
         }
     }
 

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt

@@ -104,7 +104,8 @@ class FakeTimeline(
         body: String,
         htmlBody: String?,
         mentions: List<Mention>,
-    ) -> Result<Unit> = { _, _, _, _ ->
+        fromNotification: Boolean,
+    ) -> Result<Unit> = { _, _, _, _, _ ->
         Result.success(Unit)
     }
 
@@ -113,11 +114,13 @@ class FakeTimeline(
         body: String,
         htmlBody: String?,
         mentions: List<Mention>,
+        fromNotification: Boolean,
     ): Result<Unit> = replyMessageLambda(
         eventId,
         body,
         htmlBody,
-        mentions
+        mentions,
+        fromNotification,
     )
 
     var sendImageLambda: (

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt

@@ -179,7 +179,8 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
                 eventId = threadId.asEventId(),
                 body = message,
                 htmlBody = null,
-                mentions = emptyList()
+                mentions = emptyList(),
+                fromNotification = true,
             )
         } else {
             room.liveTimeline.sendMessage(