diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-13 19:30:10 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-13 19:30:10 +0200 |
commit | dbbefe2f412b8c59690a01d3fda48627ceec6063 (patch) | |
tree | 3ab1bdf92d0b2b0e6facf1ee7ca28528af21a0b4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results | |
parent | 4c636a1471ac1013574a3d1446549a652c690b47 (diff) | |
download | open-keychain-dbbefe2f412b8c59690a01d3fda48627ceec6063.tar.gz open-keychain-dbbefe2f412b8c59690a01d3fda48627ceec6063.tar.bz2 open-keychain-dbbefe2f412b8c59690a01d3fda48627ceec6063.zip |
working version of DecryptVerifyResult
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java index 909f9f9be..e7ac209bf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java @@ -18,7 +18,6 @@ package org.sufficientlysecure.keychain.service.results; import android.os.Parcel; -import android.os.Parcelable; import org.openintents.openpgp.OpenPgpMetadata; import org.openintents.openpgp.OpenPgpSignatureResult; @@ -34,7 +33,7 @@ public class DecryptVerifyResult extends OperationResultParcel { public static final int RESULT_PENDING_NFC = RESULT_PENDING +48; long mKeyIdPassphraseNeeded; - byte[] mSessionKey; + byte[] mNfcSessionKey; OpenPgpSignatureResult mSignatureResult; OpenPgpMetadata mDecryptMetadata; @@ -48,7 +47,11 @@ public class DecryptVerifyResult extends OperationResultParcel { } public void setNfcEncryptedSessionKey(byte[] sessionKey) { - mSessionKey = sessionKey; + mNfcSessionKey = sessionKey; + } + + public byte[] getNfcEncryptedSessionKey() { + return mNfcSessionKey; } public OpenPgpSignatureResult getSignatureResult() { @@ -80,7 +83,7 @@ public class DecryptVerifyResult extends OperationResultParcel { mKeyIdPassphraseNeeded = source.readLong(); mSignatureResult = source.readParcelable(OpenPgpSignatureResult.class.getClassLoader()); mDecryptMetadata = source.readParcelable(OpenPgpMetadata.class.getClassLoader()); - mSessionKey = source.readInt() != 0 ? source.createByteArray() : null; + mNfcSessionKey = source.readInt() != 0 ? source.createByteArray() : null; } public int describeContents() { @@ -92,9 +95,9 @@ public class DecryptVerifyResult extends OperationResultParcel { dest.writeLong(mKeyIdPassphraseNeeded); dest.writeParcelable(mSignatureResult, 0); dest.writeParcelable(mDecryptMetadata, 0); - if (mSessionKey != null) { + if (mNfcSessionKey != null) { dest.writeInt(1); - dest.writeByteArray(mSessionKey); + dest.writeByteArray(mNfcSessionKey); } else { dest.writeInt(0); } |