From 39b131c7e58c358adf93bb64fe297884664a4ae1 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 30 Mar 2015 23:35:32 +0200
Subject: fix Encrypt* with RequiredInputParcel

---
 .../keychain/service/input/RequiredInputParcel.java          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input')

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 471fc0ec9..5cc2607cc 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
@@ -1,6 +1,7 @@
 package org.sufficientlysecure.keychain.service.input;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 
@@ -56,11 +57,11 @@ public class RequiredInputParcel implements Parcelable {
 
     }
 
-    public long getMasterKeyId() {
+    public Long getMasterKeyId() {
         return mMasterKeyId;
     }
 
-    public long getSubKeyId() {
+    public Long getSubKeyId() {
         return mSubKeyId;
     }
 
@@ -88,7 +89,6 @@ public class RequiredInputParcel implements Parcelable {
                 null, null, req.mSignatureTime, req.mMasterKeyId, req.mSubKeyId);
     }
 
-
     @Override
     public int describeContents() {
         return 0;
@@ -142,10 +142,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;
-- 
cgit v1.2.3