diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 19:16:36 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 19:16:36 +0200 |
commit | 18844a20bba68f8a6bf89c2faaa698c403ff1c18 (patch) | |
tree | b04fb92a44c6fa11b6b687e6b797168ac3ef471d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java | |
parent | 1deb5dbfda73b0fa72c132c318d9fb7a46aafeee (diff) | |
download | open-keychain-18844a20bba68f8a6bf89c2faaa698c403ff1c18.tar.gz open-keychain-18844a20bba68f8a6bf89c2faaa698c403ff1c18.tar.bz2 open-keychain-18844a20bba68f8a6bf89c2faaa698c403ff1c18.zip |
make masterKeyId and subKeyId strictly required in CryptoInputParcel
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java index 535c1e735..6436589e3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java @@ -7,8 +7,6 @@ import java.util.Date; import android.os.Parcel; import android.os.Parcelable; -import org.sufficientlysecure.keychain.Constants.key; - public class RequiredInputParcel implements Parcelable { @@ -23,8 +21,8 @@ public class RequiredInputParcel implements Parcelable { public final byte[][] mInputHashes; public final int[] mSignAlgos; - private Long mMasterKeyId; - private Long mSubKeyId; + private long mMasterKeyId; + private long mSubKeyId; private RequiredInputParcel(RequiredInputType type, byte[][] inputHashes, int[] signAlgos, Date signatureTime, Long masterKeyId, Long subKeyId) { @@ -62,8 +60,8 @@ public class RequiredInputParcel implements Parcelable { } mSignatureTime = source.readInt() != 0 ? new Date(source.readLong()) : null; - mMasterKeyId = source.readInt() != 0 ? source.readLong() : null; - mSubKeyId = source.readInt() != 0 ? source.readLong() : null; + mMasterKeyId = source.readLong(); + mSubKeyId = source.readLong(); } @@ -76,15 +74,17 @@ public class RequiredInputParcel implements Parcelable { } public static RequiredInputParcel createNfcSignOperation( + long masterKeyId, long subKeyId, byte[] inputHash, int signAlgo, Date signatureTime) { return new RequiredInputParcel(RequiredInputType.NFC_SIGN, new byte[][] { inputHash }, new int[] { signAlgo }, - signatureTime, null, null); + signatureTime, masterKeyId, subKeyId); } - public static RequiredInputParcel createNfcDecryptOperation(byte[] inputHash, long subKeyId) { + public static RequiredInputParcel createNfcDecryptOperation( + long masterKeyId, long subKeyId, byte[] inputHash) { return new RequiredInputParcel(RequiredInputType.NFC_DECRYPT, - new byte[][] { inputHash }, null, null, null, subKeyId); + new byte[][] { inputHash }, null, null, masterKeyId, subKeyId); } public static RequiredInputParcel createRequiredSignPassphrase( @@ -136,18 +136,8 @@ public class RequiredInputParcel implements Parcelable { } else { dest.writeInt(0); } - if (mMasterKeyId != null) { - dest.writeInt(1); - dest.writeLong(mMasterKeyId); - } else { - dest.writeInt(0); - } - if (mSubKeyId != null) { - dest.writeInt(1); - dest.writeLong(mSubKeyId); - } else { - dest.writeInt(0); - } + dest.writeLong(mMasterKeyId); + dest.writeLong(mSubKeyId); } @@ -165,10 +155,10 @@ public class RequiredInputParcel implements Parcelable { Date mSignatureTime; ArrayList<Integer> mSignAlgos = new ArrayList<>(); ArrayList<byte[]> mInputHashes = new ArrayList<>(); - Long mMasterKeyId; - Long mSubKeyId; + long mMasterKeyId; + long mSubKeyId; - public NfcSignOperationsBuilder(Date signatureTime, Long masterKeyId, Long subKeyId) { + public NfcSignOperationsBuilder(Date signatureTime, long masterKeyId, long subKeyId) { mSignatureTime = signatureTime; mMasterKeyId = masterKeyId; mSubKeyId = subKeyId; |