Merge branch 'development' into linked-identities

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

1 files changed, 11 insertions, 3 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 f0dbf0820..f4b941109 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
@@ -24,6 +24,9 @@ import android.os.Parcelable;
 import java.io.Serializable;
 import java.util.ArrayList;
 
+import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute;
+
+
 /**
  * This class is a a transferable representation for a number of keyrings to
  * be certified.
@@ -76,14 +79,19 @@ public class CertifyActionsParcel implements Parcelable {
         final public long mMasterKeyId;
 
         final public ArrayList<String> mUserIds;
+        final public ArrayList<WrappedUserAttribute> mUserAttributes;
 
-        public CertifyAction(long masterKeyId) {
-            this(masterKeyId, null);
+        public CertifyAction(long masterKeyId, ArrayList<String> userIds) {
+            mMasterKeyId = masterKeyId;
+            mUserIds = userIds;
+            mUserAttributes = null;
         }
 
-        public CertifyAction(long masterKeyId, ArrayList<String> userIds) {
+        public CertifyAction(long masterKeyId, ArrayList<String> userIds,
+                ArrayList<WrappedUserAttribute> attributes) {
             mMasterKeyId = masterKeyId;
             mUserIds = userIds;
+            mUserAttributes = attributes;
         }
     }