aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
diff options
context:
space:
mode:
authorDaniel Haß <mail@danielhass.de>2014-03-03 15:07:07 +0100
committerDaniel Haß <mail@danielhass.de>2014-03-03 15:07:07 +0100
commitec8a3469fff2718e47f6214f5364a13d84664967 (patch)
tree121e0e714fa9b4efdfa9e859459f22cd3947175f /OpenPGP-Keychain
parent6362b2de94c43eca9562af832fa0cfa77d93fbe5 (diff)
downloadopen-keychain-ec8a3469fff2718e47f6214f5364a13d84664967.tar.gz
open-keychain-ec8a3469fff2718e47f6214f5364a13d84664967.tar.bz2
open-keychain-ec8a3469fff2718e47f6214f5364a13d84664967.zip
Little fixes
Diffstat (limited to 'OpenPGP-Keychain')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java1
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java2
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index abc594b39..009c26ce5 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -224,7 +224,6 @@ public class ImportKeysListFragment extends ListFragment implements
switch (loader.getId()) {
case LOADER_ID_BYTES:
- error = data.getError();
if(error instanceof ImportKeysListLoader.FileHasNoContent) {
AppMsg.makeText(getActivity(), R.string.error_import_file_no_content,
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
index bc8e4d050..19b17468b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
@@ -131,7 +131,7 @@ public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper
}
}
} catch (Exception e) {
-
+ Log.e(Constants.TAG, "Exception on parsing key file!", e);
}
if(isEmpty) {