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

Commit 085debbb authored by Vincent Breitmoser's avatar Vincent Breitmoser
Browse files

don't save draft iff PgpMessageBuilder is used

parent 0644fa04

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

+2 −1
Original line number Diff line number Diff line
@@ -1497,7 +1497,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, 
                message.setUid(mMessageReference.getUid());

            }



            boolean saveRemotely = recipientPresenter.isAllowSavingDraftRemotely();

            // TODO more appropriate logic here? not sure

            boolean saveRemotely = !recipientPresenter.getCurrentCryptoStatus().shouldUsePgpMessageBuilder();

            new SaveMessageTask(getApplicationContext(), mAccount, mContacts, mHandler,

                    message, mDraftId, saveRemotely).execute();

            if (mFinishAfterDraftSaved) {

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

+0 −5
Original line number Diff line number Diff line
@@ -385,11 +385,6 @@ public class RecipientPresenter implements PermissionPingCallback { 
        }

    }



    public boolean isAllowSavingDraftRemotely() {

        ComposeCryptoStatus cryptoStatus = getCurrentCryptoStatus();

        return cryptoStatus.isEncryptionEnabled() || cryptoStatus.isSigningEnabled();

    }



    @SuppressWarnings("UnusedParameters")

    public void onToTokenAdded(Recipient recipient) {

        updateCryptoStatus();

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

+1 −1

File changed.

Contains only whitespace changes.