diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-07 00:05:14 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-07 00:05:14 +0200 |
commit | cfa2ecca61f6df827bdb3e99cda793cd6957cf31 (patch) | |
tree | 77121fc6a2caabedfd65505d8a8ad83d2f6b0adb /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
parent | b779211f55a126d54c643fb9f13a0a17b46c37bf (diff) | |
parent | 074b6633b015aba84f8f60a05878a93d4b8ec9b2 (diff) | |
download | open-keychain-cfa2ecca61f6df827bdb3e99cda793cd6957cf31.tar.gz open-keychain-cfa2ecca61f6df827bdb3e99cda793cd6957cf31.tar.bz2 open-keychain-cfa2ecca61f6df827bdb3e99cda793cd6957cf31.zip |
WIP! Merge branch 'v/eventbus' into v/multi-decrypt
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
2 files changed, 1 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java index 5b4f7a65b..4651f12d4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -75,10 +75,7 @@ import java.security.SignatureException; import java.util.Date; import java.util.Iterator; -/** - * This class uses a Builder pattern! - */ -public class PgpDecryptVerify extends BaseOperation { +public class PgpDecryptVerify extends BaseOperation<PgpDecryptVerifyInputParcel> { public PgpDecryptVerify(Context context, ProviderHelper providerHelper, Progressable progressable) { super(context, providerHelper, progressable); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java index fd3c4910c..fa6268758 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java @@ -20,13 +20,8 @@ package org.sufficientlysecure.keychain.pgp; import org.spongycastle.bcpg.CompressionAlgorithmTags; import org.sufficientlysecure.keychain.Constants; -import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; import org.sufficientlysecure.keychain.util.Passphrase; -import java.nio.ByteBuffer; -import java.util.Date; -import java.util.Map; - import android.os.Parcel; import android.os.Parcelable; |