aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-10 15:27:26 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-10 15:27:26 +0200
commite41e6ea0deec06703c5b9c80e429aff8ab110534 (patch)
treeba1051416937083879fb4a4f8d7234b175030837 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
parenteac582a313c779e77b0fd67358417d512680facd (diff)
downloadopen-keychain-e41e6ea0deec06703c5b9c80e429aff8ab110534.tar.gz
open-keychain-e41e6ea0deec06703c5b9c80e429aff8ab110534.tar.bz2
open-keychain-e41e6ea0deec06703c5b9c80e429aff8ab110534.zip
import-log: more interface work
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java2
1 files changed, 0 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 ebc5a7868..4cb41708d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -171,8 +171,6 @@ public class PgpImportExport {
if (newKeys > 0 || oldKeys > 0) {
if (badKeys > 0) {
resultType = ImportResult.RESULT_PARTIAL_WITH_ERRORS;
- } else if (log.containsWarnings()) {
- resultType = ImportResult.RESULT_OK_WITH_WARNINGS;
} else if (newKeys > 0 && oldKeys > 0) {
resultType = ImportResult.RESULT_OK_BOTHKEYS;
} else if (newKeys > 0) {