aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-08 03:12:26 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-08 03:12:26 +0100
commitea7068acdfdcbe78412a42f88a731a81753808ed (patch)
tree7e98ab7181756d3908ac5b2ba33fc5074ecc3b0c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parent2b5023a75d0c98738ed1aea2ea89de007cf2e3d7 (diff)
downloadopen-keychain-ea7068acdfdcbe78412a42f88a731a81753808ed.tar.gz
open-keychain-ea7068acdfdcbe78412a42f88a731a81753808ed.tar.bz2
open-keychain-ea7068acdfdcbe78412a42f88a731a81753808ed.zip
minor changes, add convertFingerprintToKeyId method
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java15
1 files changed, 5 insertions, 10 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 f4b941109..9730cd74d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
@@ -23,6 +23,7 @@ import android.os.Parcelable;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.List;
import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute;
@@ -81,17 +82,11 @@ public class CertifyActionsParcel implements Parcelable {
final public ArrayList<String> mUserIds;
final public ArrayList<WrappedUserAttribute> mUserAttributes;
- public CertifyAction(long masterKeyId, ArrayList<String> userIds) {
+ public CertifyAction(long masterKeyId, List<String> userIds,
+ List<WrappedUserAttribute> attributes) {
mMasterKeyId = masterKeyId;
- mUserIds = userIds;
- mUserAttributes = null;
- }
-
- public CertifyAction(long masterKeyId, ArrayList<String> userIds,
- ArrayList<WrappedUserAttribute> attributes) {
- mMasterKeyId = masterKeyId;
- mUserIds = userIds;
- mUserAttributes = attributes;
+ mUserIds = new ArrayList<>(userIds);
+ mUserAttributes = new ArrayList<>(attributes);
}
}