diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-24 11:35:59 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-24 11:35:59 +0200 |
| commit | 38823b73a31ae0fb82d7e385c141f1170127c4dd (patch) | |
| tree | fec3fd3ac257d1755388d021dbf0d48133dee40e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
| parent | 9e7e0be82cafc6dc98bbc31099ce0efc36a789a0 (diff) | |
| parent | c865de4002a9751928969ef30a3a5a6f943249cc (diff) | |
| download | open-keychain-38823b73a31ae0fb82d7e385c141f1170127c4dd.tar.gz open-keychain-38823b73a31ae0fb82d7e385c141f1170127c4dd.tar.bz2 open-keychain-38823b73a31ae0fb82d7e385c141f1170127c4dd.zip | |
Merge branch 'master' into improve-file-more
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java index 47a6cab1d..020b808b9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java @@ -41,6 +41,11 @@ public class SaveKeyringParcel implements Parcelable { public SaveKeyringParcel(long masterKeyId, byte[] fingerprint) { mMasterKeyId = masterKeyId; mFingerprint = fingerprint; + addUserIds = new ArrayList<String>(); + addSubKeys = new ArrayList<SubkeyAdd>(); + changeSubKeys = new ArrayList<SubkeyChange>(); + revokeUserIds = new ArrayList<String>(); + revokeSubKeys = new ArrayList<Long>(); } // performance gain for using Parcelable here would probably be negligible, |