Skip to content

fix: 9142 search results disappearing #11032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
numericOverflow wants to merge 2 commits into
base: main
Choose a base branch
from
+41 −2
Open

fix: 9142 search results disappearing #11032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ddef9b
Change message save operation from replace to update
numericOverflow May 20, 2026
ded6969
Add test for replacing envelope message with full message
numericOverflow May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions legacy/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,7 @@ internal class SaveMessageOperations(
}

return if (replaceMessageId != null) {
values.put("id", replaceMessageId)
database.replace("messages", null, values)
database.update("messages", values, "id = ?", arrayOf(replaceMessageId.toString()))
replaceMessageId
} else {
database.insert("messages", null, values)
Expand Down
40 changes: 40 additions & 0 deletions legacy/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,46 @@ class SaveMessageOperationsTest : RobolectricTest() {
assertThat(thread.messageId).isEqualTo(message.id)
}

@Test
fun `replace envelope message with full message should preserve thread entry`() {
// Arrange: simulate remote search saving a message as ENVELOPE (no body)
val envelopeMessageData = buildMessage {
header("Message-ID", "<msg0001@domain.example>")
header("Subject", "Search Result")
}.toSaveMessageData(
downloadState = MessageDownloadState.ENVELOPE,
)
saveMessageOperations.saveRemoteMessage(folderId = 1, messageServerId = "uid1", envelopeMessageData)

val threadsBeforeReplace = sqliteDatabase.readThreads()
assertThat(threadsBeforeReplace).hasSize(1)
val threadBeforeReplace = threadsBeforeReplace.first()

// Act: simulate sync re-downloading the same message as FULL
val fullMessageData = buildMessage {
header("Message-ID", "<msg0001@domain.example>")
header("Subject", "Search Result")
textBody("Full body content")
}.toSaveMessageData(
downloadState = MessageDownloadState.FULL,
)
saveMessageOperations.saveRemoteMessage(folderId = 1, messageServerId = "uid1", fullMessageData)

// Assert: thread entry must still exist and point to the same message
val messages = sqliteDatabase.readMessages()
assertThat(messages).hasSize(1)
val message = messages.first()
assertThat(message.flags).isEqualTo("X_DOWNLOADED_FULL")

val threads = sqliteDatabase.readThreads()
assertThat(threads).hasSize(1)
val thread = threads.first()
assertThat(thread.id).isEqualTo(threadBeforeReplace.id)
assertThat(thread.messageId).isEqualTo(message.id)
assertThat(thread.root).isEqualTo(thread.id)
assertThat(thread.parent).isNull()
}

@Test
fun `save local message`() {
val messageData = buildMessage {
Expand Down
Loading