Merge branch 'master' into automatic-contact-discovery

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java

1 files changed, 6 insertions, 8 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 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;
     }
 }