aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-08 04:41:41 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-08 04:41:41 +0100
commitb57bcefe080a0070a65efb6e88d76af1eface52d (patch)
treef312551aae61c43dc0ef42e1fbce06a79f7bed48 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parentea7068acdfdcbe78412a42f88a731a81753808ed (diff)
downloadopen-keychain-b57bcefe080a0070a65efb6e88d76af1eface52d.tar.gz
open-keychain-b57bcefe080a0070a65efb6e88d76af1eface52d.tar.bz2
open-keychain-b57bcefe080a0070a65efb6e88d76af1eface52d.zip
return key ids from PassphraseDialogActivity, accept null userids
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java4
1 files changed, 2 insertions, 2 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 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);
}
}