moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 08:28:50 -05:00
Code Issues Releases Wiki Activity

more work on import logging

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-10-25 02:13:02 +02:00
parent 478b2a4d8b
commit ba724353e5
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
View File

@ -172,7 +172,7 @@ public class ImportExportOperation extends BaseOperation {
byte[] data; byte[] data;
// Download by fingerprint, or keyId - whichever is available // Download by fingerprint, or keyId - whichever is available
if (entry.mExpectedFingerprint != null) { 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(); data = keyServer.get("0x" + entry.mExpectedFingerprint).getBytes();
} else { } else {
log.add(LogType.MSG_IMPORT_FETCH_KEYSERVER, 1, entry.mKeyIdHex); log.add(LogType.MSG_IMPORT_FETCH_KEYSERVER, 1, entry.mKeyIdHex);
@ -212,6 +212,7 @@ public class ImportExportOperation extends BaseOperation {
key = merged; key = merged;
} }
} else { } else {
log.add(LogType.MSG_IMPORT_FETCH_ERROR_DECODE, 2);
key = UncachedKeyRing.decodeFromData(data); key = UncachedKeyRing.decodeFromData(data);
} }
} catch (Keyserver.QueryFailedException e) { } catch (Keyserver.QueryFailedException e) {

10
OpenKeychain/src/main/res/values/strings.xml
View File

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