From b7968d62797a6fe8a5b8ba73adaf91753e1676cb Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Mon, 28 Aug 2017 17:36:19 +0200
Subject: [PATCH] don't encrypt twice to the same key if additional encryption
 id is in recipient list

---
 .../keychain/pgp/PgpSignEncryptOperation.java              | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
index 63823c1be..5684d2eae 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
@@ -330,15 +330,18 @@ public class PgpSignEncryptOperation extends BaseOperation<PgpSignEncryptInputPa
             } else {
                 log.add(LogType.MSG_PSE_ASYMMETRIC, indent);
 
-                // Asymmetric encryption
+                long additionalEncryptId = data.getAdditionalEncryptId();
                 for (long encryptMasterKeyId : data.getEncryptionMasterKeyIds()) {
+                    if (encryptMasterKeyId == additionalEncryptId) {
+                        continue;
+                    }
+
                     boolean success = processEncryptionMasterKeyId(indent, log, data, cPk, encryptMasterKeyId);
                     if (!success) {
                         return new PgpSignEncryptResult(PgpSignEncryptResult.RESULT_ERROR, log);
                     }
                 }
 
-                long additionalEncryptId = data.getAdditionalEncryptId();
                 if (additionalEncryptId != Constants.key.none) {
                     boolean success = processEncryptionMasterKeyId(indent, log, data, cPk, additionalEncryptId);
                     if (!success) {