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

Commit a357963d authored by cketti's avatar cketti
Browse files

Code style fixes

parent 9180c2c1

k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java

+63 −64
Original line number Diff line number Diff line
@@ -429,9 +429,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, 
    public void onDestroy() {

        super.onDestroy();



        if (recipientPresenter != null)

        if (recipientPresenter != null) {

            recipientPresenter.onActivityDestroy();

        }

    }



    /**

     * Handle external intents that trigger the message compose activity.
@@ -813,8 +814,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, 


                if (previousDraftId != INVALID_DRAFT_ID) {

                    if (K9.DEBUG) {

                        Log.v(K9.LOG_TAG, "Account switch, deleting draft from previous account: "

                              + previousDraftId);

                        Log.v(K9.LOG_TAG, "Account switch, deleting draft from previous account: " + previousDraftId);

                    }

                    MessagingController.getInstance(getApplication()).deleteDraft(previousAccount,

                            previousDraftId);
@@ -1115,7 +1115,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, 
                }

            }

        } catch (MessagingException me) {

            /**

            /*

             * Let the user continue composing their message even if we have a problem processing

             * the source message. Log it as an error, though.

             */
@@ -1734,5 +1734,4 @@ public class MessageCompose extends K9Activity implements OnClickListener, 
            return titleResource;

        }

    }



}

k9mail/src/main/java/com/fsck/k9/activity/compose/AttachmentPresenter.java

+3 −2
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ public class AttachmentPresenter { 
    }



    public void onClickAddAttachment(RecipientPresenter recipientPresenter) {

        AttachErrorState maybeAttachErrorState = recipientPresenter.getCurrentCryptoStatus().getAttachErrorStateOrNull();

        AttachErrorState maybeAttachErrorState =

                recipientPresenter.getCurrentCryptoStatus().getAttachErrorStateOrNull();

        if (maybeAttachErrorState != null) {

            recipientPresenter.showPgpAttachError(maybeAttachErrorState);

            return;

k9mail/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java

+0 −1
Original line number Diff line number Diff line
@@ -381,5 +381,4 @@ public class QuotedMessagePresenter { 
    public boolean isQuotedTextText() {

        return quotedTextFormat == SimpleMessageFormat.TEXT;

    }



}

k9mail/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java

+2 −2

File changed.

Contains only whitespace changes.