From 2946d442e5d51a3e65029b1df2032194d3dc7e2e Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 4 Jun 2014 21:35:03 +0200 Subject: do respect expectedFingerprint during key import --- .../keychain/keyimport/ParcelableKeyRing.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java') 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 3d3b6339a..5da6c4cd3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java @@ -3,11 +3,6 @@ package org.sufficientlysecure.keychain.keyimport; import android.os.Parcel; import android.os.Parcelable; -import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; -import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; - -import java.io.IOException; - /** This is a trivial wrapper around UncachedKeyRing which implements Parcelable. It exists * for the sole purpose of keeping spongycastle and android imports in separate packages. */ @@ -40,12 +35,15 @@ public class ParcelableKeyRing implements Parcelable { } }; - public int describeContents() { return 0; } - public UncachedKeyRing getUncachedKeyRing() throws PgpGeneralException, IOException { - return UncachedKeyRing.decodeFromData(mBytes); + public byte[] getBytes() { + return mBytes; + } + + public String getExpectedFingerprint() { + return mExpectedFingerprint; } } -- cgit v1.2.3