Remove Folder.delete(boolean)

ippschi · Jan 9, 2019 · eeb820b · eeb820b
1 parent d27180f
commit eeb820b
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 24 deletions.
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java b/app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java
@@ -1899,7 +1899,6 @@ public Void doDbWork(final SQLiteDatabase db) throws WrappedException {
         setVisibleLimit(getAccount().getDisplayCount());
     }
 
-    @Override
     public void delete(final boolean recurse) throws MessagingException {
         try {
             this.localStore.getDatabase().execute(false, new DbCallback<Void>() {

diff --git a/mail/common/src/main/java/com/fsck/k9/mail/Folder.java b/mail/common/src/main/java/com/fsck/k9/mail/Folder.java
@@ -138,8 +138,6 @@ public void fetchPart(Message message, Part part, MessageRetrievalListener<Messa
         Timber.d("fetchPart() not implemented.");
     }
 
-    public abstract void delete(boolean recurse) throws MessagingException;
-
     public abstract String getServerId();
 
     public abstract String getName();

diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolder.java b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolder.java
@@ -485,11 +485,6 @@ private long extractHighestUid(SearchResponse searchResponse) {
         return uids.get(0);
     }
 
-    @Override
-    public void delete(boolean recurse) throws MessagingException {
-        throw new Error("ImapFolder.delete() not yet implemented");
-    }
-
     @Override
     public ImapMessage getMessage(String uid) throws MessagingException {
         return new ImapMessage(uid, this);

diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/ImapFolderTest.java b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/ImapFolderTest.java
@@ -1102,13 +1102,6 @@ public void search_withRemoteSearchDisabled_shouldThrow() throws Exception {
         }
     }
 
-    @Test(expected = Error.class)
-    public void delete_notImplemented() throws Exception {
-        ImapFolder folder = createFolder("Folder");
-
-        folder.delete(false);
-    }
-
     @Test
     public void getMessageByUid_returnsNewImapMessageWithUidInFolder() throws Exception {
         ImapFolder folder = createFolder("Folder");

diff --git a/mail/protocols/pop3/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Folder.java b/mail/protocols/pop3/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Folder.java
@@ -523,10 +523,6 @@ public Map<String, String> appendMessages(List<? extends Message> messages) thro
         return null;
     }
 
-    @Override
-    public void delete(boolean recurse) throws MessagingException {
-    }
-
     @Override
     public void delete(List<? extends Message> msgs, String trashFolder) throws MessagingException {
         setFlags(msgs, Collections.singleton(Flag.DELETED), true);

diff --git a/mail/protocols/webdav/src/main/java/com/fsck/k9/mail/store/webdav/WebDavFolder.java b/mail/protocols/webdav/src/main/java/com/fsck/k9/mail/store/webdav/WebDavFolder.java
@@ -221,11 +221,6 @@ public boolean create() throws MessagingException {
         return true;
     }
 
-    @Override
-    public void delete(boolean recursive) throws MessagingException {
-        throw new Error("WebDavFolder.delete() not implemeneted");
-    }
-
     @Override
     public WebDavMessage getMessage(String uid) throws MessagingException {
         return new WebDavMessage(uid, this);