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

Commit 9ab04c09 authored by Vincent Breitmoser's avatar Vincent Breitmoser
Browse files

disable opportunistic encryption mode

parent 96c83964

k9mail/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java

+3 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ public class PgpMessageBuilder extends MessageBuilder { 


            if(!isDraft()) {

                pgpApiIntent.putExtra(OpenPgpApi.EXTRA_USER_IDS, cryptoStatus.getRecipientAddresses());

                pgpApiIntent.putExtra(OpenPgpApi.EXTRA_OPPORTUNISTIC_ENCRYPTION, cryptoStatus.isEncryptionOpportunistic());

//                pgpApiIntent.putExtra(OpenPgpApi.EXTRA_ENCRYPT_OPPORTUNISTIC, cryptoStatus.isEncryptionOpportunistic());

            }

        } else {

            pgpApiIntent = new Intent(isPgpInlineMode ? OpenPgpApi.ACTION_SIGN : OpenPgpApi.ACTION_DETACHED_SIGN);
@@ -202,6 +202,7 @@ public class PgpMessageBuilder extends MessageBuilder { 
                if (error == null) {

                    throw new MessagingException("internal openpgp api error");

                }

                /*

                boolean isOpportunisticError = error.getErrorId() == OpenPgpError.OPPORTUNISTIC_MISSING_KEYS;

                if (isOpportunisticError) {

                    if (!cryptoStatus.isEncryptionOpportunistic()) {
@@ -211,6 +212,7 @@ public class PgpMessageBuilder extends MessageBuilder { 
                    Timber.d("Skipping encryption due to opportunistic mode");

                    return null;

                }

                */

                throw new MessagingException(error.getMessage());

        }