From ba724353e5a0df3ff9ac5e1b480a56104480aca8 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 25 Oct 2014 02:13:02 +0200
Subject: more work on import logging

---
 .../keychain/operations/ImportExportOperation.java             |  3 ++-
 OpenKeychain/src/main/res/values/strings.xml                   | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain/src')

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 @@
         <item quantity="other">"Importing %d keys"</item>
     </plurals>
     <string name="msg_import_fetch_error_decode">"Error decoding retrieved keyring!"</string>
-    <string name="msg_import_fetch_error">"Key could not be fetched! (Network problems?)"</string>
-    <string name="msg_import_fetch_keybase">"Fetching from keybase.io: %s"</string>
-    <string name="msg_import_fetch_keyserver_error">"Could not fetch key from keybase!"</string>
-    <string name="msg_import_fetch_keyserver">"Fetching from keyserver: %s"</string>
-    <string name="msg_import_fetch_keyserver_ok">"Fingerprint of fetched key didn't match expected!"</string>
+    <string name="msg_import_fetch_error">"Key could not be retrieved! (Network problems?)"</string>
+    <string name="msg_import_fetch_keybase">"Retrieving from keybase.io: %s"</string>
+    <string name="msg_import_fetch_keyserver_error">"Could not retrieve key from keybase!"</string>
+    <string name="msg_import_fetch_keyserver">"Retrieving from keyserver: %s"</string>
+    <string name="msg_import_fetch_keyserver_ok">"Key retrieval successful"</string>
     <string name="msg_import_keyserver">"Using keyserver %s"</string>
     <string name="msg_import_fingerprint_error">"Fingerprint of fetched key didn't match expected!"</string>
     <string name="msg_import_fingerprint_ok">"Fingerprint check OK"</string>
-- 
cgit v1.2.3