diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-31 17:11:06 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-31 17:11:06 +0200 |
commit | 9475285013accafd24d5bc14da9ba01ca218cbe8 (patch) | |
tree | 2a55a2750e67986306be86261db174eb6142d003 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | |
parent | 1d2c93ca8ae4c75e92b5da74e262b9476f22f172 (diff) | |
download | open-keychain-9475285013accafd24d5bc14da9ba01ca218cbe8.tar.gz open-keychain-9475285013accafd24d5bc14da9ba01ca218cbe8.tar.bz2 open-keychain-9475285013accafd24d5bc14da9ba01ca218cbe8.zip |
Better exception handling for import of keys
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | 10 |
1 files changed, 5 insertions, 5 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 de8c683ff..0e59b7fdb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -134,9 +134,7 @@ public class UncachedKeyRing { } - public static List<UncachedKeyRing> fromStream(InputStream stream) - throws PgpGeneralException, IOException { - + public static List<UncachedKeyRing> fromStream(InputStream stream) throws IOException { List<UncachedKeyRing> result = new Vector<UncachedKeyRing>(); while(stream.available() > 0) { @@ -147,8 +145,10 @@ public class UncachedKeyRing { while ((obj = objectFactory.nextObject()) != null) { Log.d(Constants.TAG, "Found class: " + obj.getClass()); if (!(obj instanceof PGPKeyRing)) { - throw new PgpGeneralException( - "Bad object of type " + obj.getClass().getName() + " in stream!"); + Log.d(Constants.TAG, + "Bad object of type " + obj.getClass().getName() + " in stream, proceed with next object..."); + // skip object + continue; } result.add(new UncachedKeyRing((PGPKeyRing) obj)); } |