Skip to content
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

IMAP move operation should ignore expunge policy #7366

Merged
merged 1 commit into from
Nov 20, 2023
Merged

IMAP move operation should ignore expunge policy #7366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions app/core/src/main/java/com/fsck/k9/controller/MessagingController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,11 +893,6 @@ void processPendingMoveOrCopy(Account account, long srcFolderId, long destFolder
}

if (operation != MoveOrCopyFlavor.COPY) {
if (backend.getSupportsExpunge() && account.getExpungePolicy() == Expunge.EXPUNGE_IMMEDIATELY) {
Timber.i("processingPendingMoveOrCopy expunging folder %s:%s", account, srcFolderServerId);
backend.expungeMessages(srcFolderServerId, uids);
}

destroyPlaceholderMessages(localSourceFolder, uids);
}

Expand Down
16 changes: 14 additions & 2 deletions mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,11 @@ internal class RealImapFolder(
return null
}

val uids = messages.map { it.uid }

val uidMapping = copyMessages(messages, folder)
setFlags(messages, setOf(Flag.DELETED), true)
expungeUidsOnly(uids)

return uidMapping
}
Expand Down Expand Up @@ -1080,8 +1083,15 @@ internal class RealImapFolder(
}
}

@Throws(MessagingException::class)
override fun expungeUids(uids: List<String>) {
expungeUids(uids, fullExpungeFallback = true)
}

private fun expungeUidsOnly(uids: List<String>) {
expungeUids(uids, fullExpungeFallback = false)
}

private fun expungeUids(uids: List<String>, fullExpungeFallback: Boolean) {
require(uids.isNotEmpty()) { "expungeUids() must be called with a non-empty set of UIDs" }

open(OpenMode.READ_WRITE)
Expand All @@ -1091,8 +1101,10 @@ internal class RealImapFolder(
if (connection!!.isUidPlusCapable) {
val longUids = uids.map { it.toLong() }.toSet()
connection!!.executeCommandWithIdSet(Commands.UID_EXPUNGE, "", longUids)
} else {
} else if (fullExpungeFallback) {
executeSimpleCommand("EXPUNGE")
} else {
Timber.v("Server doesn't support expunging individual messages: %s", uids)
}
} catch (ioe: IOException) {
throw ioExceptionHandler(connection, ioe)
Expand Down
25 changes: 24 additions & 1 deletion mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ import org.mockito.kotlin.doReturn
import org.mockito.kotlin.doThrow
import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
import org.mockito.kotlin.never
import org.mockito.kotlin.stub
import org.mockito.kotlin.whenever

class RealImapFolderTest {
Expand Down Expand Up @@ -312,16 +314,37 @@ class RealImapFolderTest {
}

@Test
fun moveMessages_shouldDeleteMessagesFromSourceFolder() {
fun `moveMessages() should delete messages from source folder but not issue EXPUNGE command`() {
val sourceFolder = createFolder("Folder")
prepareImapFolderForOpen(OpenMode.READ_WRITE)
imapConnection.stub {
on { isUidPlusCapable } doReturn false
}
val destinationFolder = createFolder("Destination")
val messages = listOf(createImapMessage("1"))
sourceFolder.open(OpenMode.READ_WRITE)

sourceFolder.moveMessages(messages, destinationFolder)

assertCommandWithIdsIssued("UID STORE 1 +FLAGS.SILENT (\\Deleted)")
verify(imapConnection, never()).executeSimpleCommand("EXPUNGE")
}

@Test
fun `moveMessages() should delete messages from source folder and issue UID EXPUNGE command when available`() {
val sourceFolder = createFolder("Folder")
prepareImapFolderForOpen(OpenMode.READ_WRITE)
imapConnection.stub {
on { isUidPlusCapable } doReturn true
}
val destinationFolder = createFolder("Destination")
val messages = listOf(createImapMessage("1"))
sourceFolder.open(OpenMode.READ_WRITE)

sourceFolder.moveMessages(messages, destinationFolder)

assertCommandWithIdsIssued("UID STORE 1 +FLAGS.SILENT (\\Deleted)")
assertCommandWithIdsIssued("UID EXPUNGE 1")
}

@Test
Expand Down