aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-22 13:41:54 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-22 13:41:54 +0200
commit22ea9c60475b20819a29b535b772b699526d0146 (patch)
treeef1529ebf22d5632cb671785e69fd49c1d908f33
parent857b15cbd5e84dc94350b4b2b1317c5ac411af38 (diff)
downloadopen-keychain-22ea9c60475b20819a29b535b772b699526d0146.tar.gz
open-keychain-22ea9c60475b20819a29b535b772b699526d0146.tar.bz2
open-keychain-22ea9c60475b20819a29b535b772b699526d0146.zip
fix parcel method in ParcelableKeyRing
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java
index fdf561aaf..066c51a13 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java
@@ -27,7 +27,9 @@ public class ParcelableKeyRing implements Parcelable {
public static final Creator<ParcelableKeyRing> CREATOR = new Creator<ParcelableKeyRing>() {
public ParcelableKeyRing createFromParcel(final Parcel source) {
- return new ParcelableKeyRing(source.createByteArray());
+ byte[] bytes = source.createByteArray();
+ String expectedFingerprint = source.readString();
+ return new ParcelableKeyRing(bytes, expectedFingerprint);
}
public ParcelableKeyRing[] newArray(final int size) {