diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-11 09:00:22 +0300 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-11 09:00:22 +0300 |
commit | 39849c2c572e23341d3fda260e72d4fc8367a68d (patch) | |
tree | 0387f7e2126911bdf3d9f13bd727386b17af0ab2 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | |
parent | c8a0eb3a083c92b654610f34655fed80312a8ef1 (diff) | |
parent | c942d8b2ff062abce236ebff6fba268ab5247038 (diff) | |
download | open-keychain-39849c2c572e23341d3fda260e72d4fc8367a68d.tar.gz open-keychain-39849c2c572e23341d3fda260e72d4fc8367a68d.tar.bz2 open-keychain-39849c2c572e23341d3fda260e72d4fc8367a68d.zip |
Merge pull request #1771 from runnerway/refactoring-operation
PgpSignEncryptOperation refactoring
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java index d5c540856..80bac18e3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java @@ -63,6 +63,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.provider.TemporaryFileProvider; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; @@ -620,9 +621,7 @@ public class EncryptFilesFragment } // fill values for this action - SignEncryptParcel data = new SignEncryptParcel(); - - data.addInputUris(mFilesAdapter.getAsArrayList()); + PgpSignEncryptData data = new PgpSignEncryptData(); if (mUseCompression) { data.setCompressionAlgorithm( @@ -673,7 +672,11 @@ public class EncryptFilesFragment data.setSymmetricPassphrase(passphrase); } - return data; + + SignEncryptParcel parcel = new SignEncryptParcel(data); + parcel.addInputUris(mFilesAdapter.getAsArrayList()); + + return parcel; } private Intent createSendIntent() { |