aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-20 14:57:38 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-20 14:57:38 +0100
commite00ce86de911e5b3f9aa7f5d8f1cb40e310e95e3 (patch)
tree0959dd935a89f84184dd55a82fe4cadb98c9f982 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
parent3fce6d8a12884519fa77e1500e8f8441b3aa43cd (diff)
downloadopen-keychain-e00ce86de911e5b3f9aa7f5d8f1cb40e310e95e3.tar.gz
open-keychain-e00ce86de911e5b3f9aa7f5d8f1cb40e310e95e3.tar.bz2
open-keychain-e00ce86de911e5b3f9aa7f5d8f1cb40e310e95e3.zip
fix more unit tests (syntax)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
index 405a6a24b..8721f4c0c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
@@ -42,17 +42,14 @@ public class CertifyActionsParcel implements Parcelable {
public CertifyLevel mLevel;
public ArrayList<CertifyAction> mCertifyActions = new ArrayList<>();
- public CryptoInputParcel mCryptoInput;
- public CertifyActionsParcel(CryptoInputParcel cryptoInput, long masterKeyId) {
+ public CertifyActionsParcel(long masterKeyId) {
mMasterKeyId = masterKeyId;
- mCryptoInput = cryptoInput != null ? cryptoInput : new CryptoInputParcel(new Date());
mLevel = CertifyLevel.DEFAULT;
}
public CertifyActionsParcel(Parcel source) {
mMasterKeyId = source.readLong();
- mCryptoInput = source.readParcelable(CertifyActionsParcel.class.getClassLoader());
// just like parcelables, this is meant for ad-hoc IPC only and is NOT portable!
mLevel = CertifyLevel.values()[source.readInt()];
@@ -66,16 +63,11 @@ public class CertifyActionsParcel implements Parcelable {
@Override
public void writeToParcel(Parcel destination, int flags) {
destination.writeLong(mMasterKeyId);
- destination.writeParcelable(mCryptoInput, 0);
destination.writeInt(mLevel.ordinal());
destination.writeSerializable(mCertifyActions);
}
- public Map<ByteBuffer, byte[]> getSignatureData() {
- return mCryptoInput.getCryptoData();
- }
-
public static final Creator<CertifyActionsParcel> CREATOR = new Creator<CertifyActionsParcel>() {
public CertifyActionsParcel createFromParcel(final Parcel source) {
return new CertifyActionsParcel(source);