Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 05e06d8d authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6606 from thundernest/fix_pop3_delete 

POP3: Fix logic to delete messages on the server
parents 679a2648 b1426e5e

app/core/src/main/java/com/fsck/k9/controller/MessagingController.java

+2 −3
Original line number Diff line number Diff line
@@ -2028,8 +2028,7 @@ public class MessagingController { 
            boolean isSpamFolder = account.hasSpamFolder() && account.getSpamFolderId() == folderId;

            boolean doNotMoveToTrashFolder = skipTrashFolder ||

                !account.hasTrashFolder() || folderId == trashFolderId ||

                isSpamFolder ||

                (backend.getSupportsTrashFolder() && !backend.isDeleteMoveToTrash());

                isSpamFolder;



            LocalFolder localTrashFolder = null;

            if (doNotMoveToTrashFolder) {
@@ -2096,7 +2095,7 @@ public class MessagingController { 
                // Nothing to do on the remote side

            } else if (!syncedMessageUids.isEmpty()) {

                if (account.getDeletePolicy() == DeletePolicy.ON_DELETE) {

                    if (doNotMoveToTrashFolder) {

                    if (doNotMoveToTrashFolder || !backend.getSupportsTrashFolder()) {

                        queueDelete(account, folderId, syncedMessageUids);

                    } else if (account.isMarkMessageAsReadOnDelete()) {

                        queueMoveOrCopy(account, folderId, trashFolderId,

backend/api/src/main/java/com/fsck/k9/backend/api/Backend.kt

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ interface Backend { 
    val supportsTrashFolder: Boolean

    val supportsSearchByDate: Boolean

    val isPushCapable: Boolean

    val isDeleteMoveToTrash: Boolean



    @Throws(MessagingException::class)

    fun refreshFolderList()

backend/demo/src/main/java/app/k9mail/backend/demo/DemoBackend.kt

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ class DemoBackend(private val backendStorage: BackendStorage) : Backend { 
    override val supportsTrashFolder: Boolean = true

    override val supportsSearchByDate: Boolean = false

    override val isPushCapable: Boolean = false

    override val isDeleteMoveToTrash: Boolean = true



    override fun refreshFolderList() {

        val localFolderServerIds = backendStorage.getFolderServerIds().toSet()

backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackend.kt

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ class ImapBackend( 
    override val supportsTrashFolder = true

    override val supportsSearchByDate = true

    override val isPushCapable = true

    override val isDeleteMoveToTrash = true



    override fun refreshFolderList() {

        commandRefreshFolderList.refreshFolderList()

backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapBackend.kt

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ class JmapBackend( 
    override val supportsTrashFolder = true

    override val supportsSearchByDate = true

    override val isPushCapable = false // FIXME

    override val isDeleteMoveToTrash = true



    override fun refreshFolderList() {

        commandRefreshFolderList.refreshFolderList()