From b57bcefe080a0070a65efb6e88d76af1eface52d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 8 Mar 2015 04:41:41 +0100
Subject: return key ids from PassphraseDialogActivity, accept null userids

---
 .../org/sufficientlysecure/keychain/service/CertifyActionsParcel.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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 9730cd74d..57a11de21 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
@@ -85,8 +85,8 @@ public class CertifyActionsParcel implements Parcelable {
         public CertifyAction(long masterKeyId, List<String> userIds,
                 List<WrappedUserAttribute> attributes) {
             mMasterKeyId = masterKeyId;
-            mUserIds = new ArrayList<>(userIds);
-            mUserAttributes = new ArrayList<>(attributes);
+            mUserIds = userIds == null ? null : new ArrayList<>(userIds);
+            mUserAttributes = attributes == null ? null : new ArrayList<>(attributes);
         }
     }
 
-- 
cgit v1.2.3