diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-19 02:02:51 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-19 02:02:51 +0200 |
commit | 3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd (patch) | |
tree | d8d7ad9ea2b8fac8c988ec38885d4645242c5168 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget | |
parent | 4c461c1b445eb339382b5ffd174e6d19b93f25d0 (diff) | |
download | open-keychain-3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd.tar.gz open-keychain-3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd.tar.bz2 open-keychain-3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd.zip |
Work on new Import activity
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget')
-rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java | 4 |
1 files changed, 3 insertions, 1 deletions
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); |