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

Commit afb5e493 authored by Vincent Breitmoser's avatar Vincent Breitmoser
Browse files

prefer sign-only dialog over pgp/inline dialog for icon click, and disable together

parent 0ecf5bcf

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

+4 −3
Original line number Diff line number Diff line
@@ -743,6 +743,7 @@ public class RecipientPresenter implements PermissionPingCallback { 
    }



    public void onCryptoPgpSignOnlyDisabled() {

        onCryptoPgpInlineChanged(false);

        onCryptoModeChanged(CryptoMode.OPPORTUNISTIC);

    }
@@ -766,10 +767,10 @@ public class RecipientPresenter implements PermissionPingCallback { 


    void onClickCryptoSpecialModeIndicator() {

        ComposeCryptoStatus currentCryptoStatus = getCurrentCryptoStatus();

        if (currentCryptoStatus.isPgpInlineModeEnabled()) {

            recipientMvpView.showOpenPgpInlineDialog(false);

        } else if (currentCryptoStatus.isSignOnly()) {

        if (currentCryptoStatus.isSignOnly()) {

            recipientMvpView.showOpenPgpSignOnlyDialog(false);

        } else if (currentCryptoStatus.isPgpInlineModeEnabled()) {

            recipientMvpView.showOpenPgpInlineDialog(false);

        } else {

            throw new IllegalStateException("This icon should not be clickable while no special mode is active!");

        }