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

Commit 0dfa6345 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #1702 from k9mail/fix-old-api-npe 

Avoid indirect call to invalidateOptionsMenu() before recipientPresenter is initialized
parents b01f49b3 a88ccfd9

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

+2 −0
Original line number Diff line number Diff line
@@ -360,6 +360,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, 
        ComposePgpInlineDecider composePgpInlineDecider = new ComposePgpInlineDecider();

        recipientPresenter = new RecipientPresenter(getApplicationContext(), getLoaderManager(), recipientMvpView,

                mAccount, composePgpInlineDecider, new ReplyToParser());

        recipientPresenter.updateCryptoStatus();





        mSubjectView = (EditText) findViewById(R.id.subject);

        mSubjectView.getInputExtras(true).putBoolean("allowEmoji", true);

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

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ public class RecipientPresenter implements PermissionPingCallback { 
        recipientMvpView.setPresenter(this);

        recipientMvpView.setLoaderManager(loaderManager);

        onSwitchAccount(account);

        updateCryptoStatus();

    }



    public List<Address> getToAddresses() {

k9mail/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.java

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ public class RecipientPresenterTest { 


        recipientPresenter = new RecipientPresenter(

                context, loaderManager, recipientMvpView, account, composePgpInlineDecider, replyToParser);

        recipientPresenter.updateCryptoStatus();

    }



    @Test