aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-10-25 02:13:02 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-10-25 02:13:02 +0200
commitba724353e5a0df3ff9ac5e1b480a56104480aca8 (patch)
tree43f63cf26cac02bd93417cb9a40f0ed6978f9832 /OpenKeychain/src/main/java/org/sufficientlysecure
parent478b2a4d8ba9de9a1c6756c592c9d26f6ce06c52 (diff)
downloadopen-keychain-ba724353e5a0df3ff9ac5e1b480a56104480aca8.tar.gz
open-keychain-ba724353e5a0df3ff9ac5e1b480a56104480aca8.tar.bz2
open-keychain-ba724353e5a0df3ff9ac5e1b480a56104480aca8.zip
more work on import logging
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
index 4db48015f..9cd0b516a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
@@ -172,7 +172,7 @@ public class ImportExportOperation extends BaseOperation {
byte[] data;
// Download by fingerprint, or keyId - whichever is available
if (entry.mExpectedFingerprint != null) {
- log.add(LogType.MSG_IMPORT_FETCH_KEYSERVER, 1, "0x" + entry.mExpectedFingerprint);
+ log.add(LogType.MSG_IMPORT_FETCH_KEYSERVER, 1, "0x" + entry.mExpectedFingerprint.substring(24));
data = keyServer.get("0x" + entry.mExpectedFingerprint).getBytes();
} else {
log.add(LogType.MSG_IMPORT_FETCH_KEYSERVER, 1, entry.mKeyIdHex);
@@ -212,6 +212,7 @@ public class ImportExportOperation extends BaseOperation {
key = merged;
}
} else {
+ log.add(LogType.MSG_IMPORT_FETCH_ERROR_DECODE, 2);
key = UncachedKeyRing.decodeFromData(data);
}
} catch (Keyserver.QueryFailedException e) {