From 3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 19 Sep 2013 02:02:51 +0200
Subject: Work on new Import activity

---
 .../sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget')

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java
index 45f23d443..b10e5fd26 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java
@@ -65,13 +65,15 @@ public class ImportKeysListLoader extends AsyncTaskLoader<List<Map<String, Strin
         InputData inputData = null;
         if (mKeyringBytes != null) {
             inputData = new InputData(new ByteArrayInputStream(mKeyringBytes), mKeyringBytes.length);
-        } else {
+        } else if (mImportFilename != null) {
             try {
                 inputData = new InputData(new FileInputStream(mImportFilename),
                         mImportFilename.length());
             } catch (FileNotFoundException e) {
                 Log.e(Constants.TAG, "Failed to init FileInputStream!", e);
             }
+        } else {
+            return data;
         }
 
         generateListOfKeyrings(inputData);
-- 
cgit v1.2.3