aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-30 16:40:41 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-30 16:40:41 +0200
commitd7b79e55fba170a0fe691f00dbc943d8ecfff33e (patch)
tree229ddba3f98752b0c347ebb1960cadf646aae1e5 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
parent2050be3995bde67541ceb78050b3c9143907444f (diff)
downloadopen-keychain-d7b79e55fba170a0fe691f00dbc943d8ecfff33e.tar.gz
open-keychain-d7b79e55fba170a0fe691f00dbc943d8ecfff33e.tar.bz2
open-keychain-d7b79e55fba170a0fe691f00dbc943d8ecfff33e.zip
pass CryptoInputParcel independently for SignEncryptOperation
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
index 3303b2c65..7197cf88d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
@@ -344,12 +344,9 @@ public class EncryptTextFragment extends CryptoOperationFragment {
intent.setAction(KeychainIntentService.ACTION_SIGN_ENCRYPT);
final SignEncryptParcel input = createEncryptBundle();
- if (cryptoInput != null) {
- input.setCryptoInput(cryptoInput);
- }
-
final Bundle data = new Bundle();
data.putParcelable(KeychainIntentService.SIGN_ENCRYPT_PARCEL, input);
+ data.putParcelable(KeychainIntentService.EXTRA_CRYPTO_INPUT, cryptoInput);
intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
// Message is received after encrypting is done in KeychainIntentService