From c942d8b2ff062abce236ebff6fba268ab5247038 Mon Sep 17 00:00:00 2001 From: Andrea Torlaschi Date: Tue, 8 Mar 2016 18:47:46 +0100 Subject: PgpSignEncryptOperation refactoring --- .../sufficientlysecure/keychain/ui/EncryptTextFragment.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java') 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 10d88253d..f805c70c3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java @@ -38,6 +38,7 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.SignEncryptResult; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.pgp.PgpSecurityConstants; +import org.sufficientlysecure.keychain.pgp.PgpSignEncryptData; import org.sufficientlysecure.keychain.pgp.SignEncryptParcel; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; import org.sufficientlysecure.keychain.ui.base.CachingCryptoOperationFragment; @@ -230,9 +231,8 @@ public class EncryptTextFragment } // fill values for this action - SignEncryptParcel data = new SignEncryptParcel(); + PgpSignEncryptData data = new PgpSignEncryptData(); - data.setBytes(mMessage.getBytes()); data.setCleartextSignature(true); if (mUseCompression) { @@ -283,7 +283,11 @@ public class EncryptTextFragment } data.setSymmetricPassphrase(passphrase); } - return data; + + SignEncryptParcel parcel = new SignEncryptParcel(data); + parcel.setBytes(mMessage.getBytes()); + + return parcel; } private void copyToClipboard(SignEncryptResult result) { -- cgit v1.2.3