fix nullpointerexception in importkeyactivity

1 files changed, 10 insertions, 2 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index c50d92f7a..6fc55cfb8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -123,11 +123,16 @@ public class PgpImportExport {
     }
 
     /** Imports keys from given data. If keyIds is given only those are imported */
-    public ImportResult importKeyRings(List<ParcelableKeyRing> entries)
-            throws PgpGeneralException, PGPException, IOException {
+    public ImportResult importKeyRings(List<ParcelableKeyRing> entries) {
 
         updateProgress(R.string.progress_importing, 0, 100);
 
+        // If there aren't even any keys, do nothing here.
+        if (entries == null || entries.size() == 0) {
+            return new ImportResult(
+                    ImportResult.RESULT_FAIL_NOTHING, mProviderHelper.getLog(), 0, 0, 0);
+        }
+
         int newKeys = 0, oldKeys = 0, badKeys = 0;
 
         int position = 0;
@@ -165,6 +170,9 @@ public class PgpImportExport {
                     newKeys += 1;
                 }
 
+            } catch (IOException e) {
+                Log.e(Constants.TAG, "Encountered bad key on import!", e);
+                ++badKeys;
             } catch (PgpGeneralException e) {
                 Log.e(Constants.TAG, "Encountered bad key on import!", e);
                 ++badKeys;