From 9c5c013538a833aa071c15fefb5e918098d7fc6c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 8 May 2014 15:31:03 +0200
Subject: use setEncryptToSigner for asymmetric encryption

(tested and works, closes #569)
---
 .../main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java  | 2 --
 .../org/sufficientlysecure/keychain/service/KeychainIntentService.java | 1 +
 .../org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java  | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'OpenKeychain')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
index 30cac9b77..665dc82cc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -192,8 +192,6 @@ public class PgpSignEncrypt {
         }
 
         /**
-         * TODO: test this option!
-         *
          * @param encryptToSigner
          * @return
          */
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index d2e9533a7..d363a4119 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -324,6 +324,7 @@ public class KeychainIntentService extends IntentService
                         .setEncryptionMasterKeyIds(encryptionKeyIds)
                         .setSymmetricPassphrase(symmetricPassphrase)
                         .setSignatureMasterKeyId(signatureKeyId)
+                        .setEncryptToSigner(true)
                         .setSignatureHashAlgorithm(
                                 Preferences.getPreferences(this).getDefaultHashAlgorithm())
                         .setSignaturePassphrase(
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
index d1a5dca07..c954e6465 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
@@ -226,9 +226,6 @@ public class EncryptAsymmetricFragment extends Fragment {
     private void selectPublicKeys() {
         Intent intent = new Intent(getActivity(), SelectPublicKeyActivity.class);
         Vector<Long> keyIds = new Vector<Long>();
-        if (mSecretKeyId != 0) {
-            keyIds.add(mSecretKeyId);
-        }
         if (mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0) {
             for (int i = 0; i < mEncryptionKeyIds.length; ++i) {
                 keyIds.add(mEncryptionKeyIds[i]);
-- 
cgit v1.2.3