diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java index 0d1f491f3..12c3ab728 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -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) { diff --git a/backend/api/src/main/java/com/fsck/k9/backend/api/Backend.kt b/backend/api/src/main/java/com/fsck/k9/backend/api/Backend.kt index 5d657469a..d30476a44 100644 --- a/backend/api/src/main/java/com/fsck/k9/backend/api/Backend.kt +++ b/backend/api/src/main/java/com/fsck/k9/backend/api/Backend.kt @@ -15,7 +15,6 @@ interface Backend { val supportsTrashFolder: Boolean val supportsSearchByDate: Boolean val isPushCapable: Boolean - val isDeleteMoveToTrash: Boolean @Throws(MessagingException::class) fun refreshFolderList() diff --git a/backend/demo/src/main/java/app/k9mail/backend/demo/DemoBackend.kt b/backend/demo/src/main/java/app/k9mail/backend/demo/DemoBackend.kt index cfc686e3c..c8823c450 100644 --- a/backend/demo/src/main/java/app/k9mail/backend/demo/DemoBackend.kt +++ b/backend/demo/src/main/java/app/k9mail/backend/demo/DemoBackend.kt @@ -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() diff --git a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackend.kt b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackend.kt index a0bc860c9..46c16cf6e 100644 --- a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackend.kt +++ b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackend.kt @@ -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() diff --git a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapBackend.kt b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapBackend.kt index 92b1ddaa7..70350e0e4 100644 --- a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapBackend.kt +++ b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapBackend.kt @@ -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() diff --git a/backend/pop3/src/main/java/com/fsck/k9/backend/pop3/Pop3Backend.kt b/backend/pop3/src/main/java/com/fsck/k9/backend/pop3/Pop3Backend.kt index 64308ee0d..f3974aebb 100644 --- a/backend/pop3/src/main/java/com/fsck/k9/backend/pop3/Pop3Backend.kt +++ b/backend/pop3/src/main/java/com/fsck/k9/backend/pop3/Pop3Backend.kt @@ -32,7 +32,6 @@ class Pop3Backend( override val supportsTrashFolder = false override val supportsSearchByDate = false override val isPushCapable = false - override val isDeleteMoveToTrash = false override fun refreshFolderList() { commandRefreshFolderList.refreshFolderList() diff --git a/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/WebDavBackend.kt b/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/WebDavBackend.kt index 79a9d666f..aeeece231 100644 --- a/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/WebDavBackend.kt +++ b/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/WebDavBackend.kt @@ -34,7 +34,6 @@ class WebDavBackend( override val supportsTrashFolder = true override val supportsSearchByDate = false override val isPushCapable = false - override val isDeleteMoveToTrash = true override fun refreshFolderList() { commandGetFolders.refreshFolderList()