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) { diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index a65894fcc..656f3b5cd 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -947,11 +947,11 @@ "Importing %d keys" "Error decoding retrieved keyring!" - "Key could not be fetched! (Network problems?)" - "Fetching from keybase.io: %s" - "Could not fetch key from keybase!" - "Fetching from keyserver: %s" - "Fingerprint of fetched key didn't match expected!" + "Key could not be retrieved! (Network problems?)" + "Retrieving from keybase.io: %s" + "Could not retrieve key from keybase!" + "Retrieving from keyserver: %s" + "Key retrieval successful" "Using keyserver %s" "Fingerprint of fetched key didn't match expected!" "Fingerprint check OK"