Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain

1 files changed, 23 insertions, 6 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
index 08ac16ec4..1f8dec7a1 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
@@ -59,13 +59,30 @@ public class PgpConversionHelper {
      * @return
      */
     public static ArrayList<PGPSecretKey> BytesToPGPSecretKeyList(byte[] keysBytes) {
-        PGPSecretKeyRing keyRing = (PGPSecretKeyRing) BytesToPGPKeyRing(keysBytes);
+        PGPObjectFactory factory = new PGPObjectFactory(keysBytes);
+        Object obj = null;
         ArrayList<PGPSecretKey> keys = new ArrayList<PGPSecretKey>();
-
-        @SuppressWarnings("unchecked")
-        Iterator<PGPSecretKey> itr = keyRing.getSecretKeys();
-        while (itr.hasNext()) {
-            keys.add(itr.next());
+        try {
+            while ((obj = factory.nextObject()) != null) {
+                PGPSecretKey secKey = null;
+                if(obj instanceof PGPSecretKey) {
+                    if ((secKey = (PGPSecretKey)obj ) == null) {
+                        Log.e(Constants.TAG, "No keys given!");
+                    }
+                    keys.add(secKey);
+                } else if(obj instanceof PGPSecretKeyRing) { //master keys are sent as keyrings
+                    PGPSecretKeyRing keyRing = null;
+                    if ((keyRing = (PGPSecretKeyRing)obj) == null) {
+                        Log.e(Constants.TAG, "No keys given!");
+                    }
+                    @SuppressWarnings("unchecked")
+                    Iterator<PGPSecretKey> itr = keyRing.getSecretKeys();
+                    while (itr.hasNext()) {
+                        keys.add(itr.next());
+                    }
+                }
+            }
+        } catch (IOException e) {
         }
 
         return keys;