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

Unverified Commit d1c47012 authored by Vincent Breitmoser's avatar Vincent Breitmoser Committed by GitHub
Browse files

Merge pull request #3808 from artbristol/remove-exception-todo 

Remove TODO
parents 278e7d33 5e3141d2

mail/common/src/main/java/com/fsck/k9/mail/MessagingException.java

+0 −5
Original line number Diff line number Diff line
@@ -28,9 +28,4 @@ public class MessagingException extends Exception { 
        return permanentFailure;

    }



    //TODO setters in Exception are bad style, remove (it's nearly unused anyway)

    public void setPermanentFailure(boolean permanentFailure) {

        this.permanentFailure = permanentFailure;

    }



}

mail/protocols/pop3/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Folder.java

+4 −4
Original line number Diff line number Diff line
@@ -565,10 +565,10 @@ public class Pop3Folder extends Folder<Pop3Message> { 


            Integer msgNum = uidToMsgNumMap.get(message.getUid());

            if (msgNum == null) {

                MessagingException me = new MessagingException("Could not delete message " + message.getUid()

                        + " because no msgNum found; permanent error");

                me.setPermanentFailure(true);

                throw me;

                throw new MessagingException(

                        "Could not delete message " + message.getUid() + " because no msgNum found; permanent error",

                        true

                );

            }

            open(Folder.OPEN_MODE_RW);

            connection.executeSimpleCommand(String.format(DELE_COMMAND + " %s", msgNum));

mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java

+1 −4
Original line number Diff line number Diff line
@@ -452,10 +452,7 @@ public class SmtpTransport extends Transport { 
        } catch (NegativeSmtpReplyException e) {

            throw e;

        } catch (Exception e) {

            MessagingException me = new MessagingException("Unable to send message", e);

            me.setPermanentFailure(entireMessageSent);



            throw me;

            throw new MessagingException("Unable to send message", entireMessageSent, e);

        } finally {

            close();

        }