1 files changed, 33 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
index 86a2ed48d..58601c49a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -1,7 +1,15 @@
 package org.sufficientlysecure.keychain.pgp;
 
+import org.spongycastle.openpgp.PGPObjectFactory;
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
+import org.spongycastle.openpgp.PGPUtil;
+import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 public class UncachedKeyRing {
 
@@ -9,8 +17,6 @@ public class UncachedKeyRing {
     final PGPSecretKeyRing mSecretRing;
 
     UncachedKeyRing(PGPPublicKeyRing publicRing, PGPSecretKeyRing secretRing) {
-        // this one must not be false!
-        assert(publicRing != null);
         mPublicRing = publicRing;
         mSecretRing = secretRing;
     }
@@ -26,4 +32,29 @@ public class UncachedKeyRing {
     public PGPSecretKeyRing getSecretRing() {
         return mSecretRing;
     }
+
+    public byte[] getFingerprint() {
+        return mPublicRing.getPublicKey().getFingerprint();
+    }
+
+    public static UncachedKeyRing decodePubkeyFromData(byte[] data)
+            throws PgpGeneralException, IOException {
+        BufferedInputStream bufferedInput =
+                new BufferedInputStream(new ByteArrayInputStream(data));
+        if (bufferedInput.available() > 0) {
+            InputStream in = PGPUtil.getDecoderStream(bufferedInput);
+            PGPObjectFactory objectFactory = new PGPObjectFactory(in);
+
+            // get first object in block
+            Object obj;
+            if ((obj = objectFactory.nextObject()) != null && obj instanceof PGPPublicKeyRing) {
+                return new UncachedKeyRing((PGPPublicKeyRing) obj);
+            } else {
+                throw new PgpGeneralException("Object not recognized as PGPPublicKeyRing!");
+            }
+        } else {
+            throw new PgpGeneralException("Object not recognized as PGPPublicKeyRing!");
+        }
+    }
+
 }