cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some DecryptVerify log refinements

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-09-13 21:21:48 +02:00
parent efd9d1626e
commit 7b08b18d25
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
View File

@@ -64,6 +64,7 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.URLConnection; import java.net.URLConnection;
import java.security.SignatureException; import java.security.SignatureException;
import java.util.Date;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
@@ -403,7 +404,7 @@ public class PgpDecryptVerify {
updateProgress(R.string.progress_extracting_key, currentProgress, 100); updateProgress(R.string.progress_extracting_key, currentProgress, 100);
try { try {
log.add(LogLevel.WARN, LogType.MSG_DC_UNLOCKING, indent +1); log.add(LogLevel.INFO, LogType.MSG_DC_UNLOCKING, indent +1);
if (!secretEncryptionKey.unlock(mPassphrase)) { if (!secretEncryptionKey.unlock(mPassphrase)) {
log.add(LogLevel.ERROR, LogType.MSG_DC_ERROR_BAD_PASSPHRASE, indent +1); log.add(LogLevel.ERROR, LogType.MSG_DC_ERROR_BAD_PASSPHRASE, indent +1);
return new DecryptVerifyResult(DecryptVerifyResult.RESULT_ERROR, log); return new DecryptVerifyResult(DecryptVerifyResult.RESULT_ERROR, log);
@@ -554,10 +555,17 @@ public class PgpDecryptVerify {
literalData.getModificationTime().getTime(), literalData.getModificationTime().getTime(),
originalSize); originalSize);
log.add(LogLevel.DEBUG, LogType.MSG_DC_CLEAR_META_FILE, indent +1); if ( ! originalFilename.equals("")) {
log.add(LogLevel.DEBUG, LogType.MSG_DC_CLEAR_META_MIME, indent +1); log.add(LogLevel.DEBUG, LogType.MSG_DC_CLEAR_META_FILE, indent + 1, originalFilename);
log.add(LogLevel.DEBUG, LogType.MSG_DC_CLEAR_META_TIME, indent +1); }
log.add(LogLevel.DEBUG, LogType.MSG_DC_CLEAR_META_SIZE, indent +1); log.add(LogLevel.DEBUG, LogType.MSG_DC_CLEAR_META_MIME, indent +1,
mimeType);
log.add(LogLevel.DEBUG, LogType.MSG_DC_CLEAR_META_TIME, indent +1,
new Date(literalData.getModificationTime().getTime()).toString());
if (originalSize != 0) {
log.add(LogLevel.DEBUG, LogType.MSG_DC_CLEAR_META_SIZE, indent + 1,
Long.toString(originalSize));
}
// return here if we want to decrypt the metadata only // return here if we want to decrypt the metadata only
if (mDecryptMetadataOnly) { if (mDecryptMetadataOnly) {

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

@@ -767,10 +767,10 @@
<!-- Messages for DecryptVerify operation --> <!-- Messages for DecryptVerify operation -->
<string name="msg_dc_askip_no_key">"Data not encrypted with known key, skipping…"</string> <string name="msg_dc_askip_no_key">"Data not encrypted with known key, skipping…"</string>
<string name="msg_dc_askip_not_allowed">"Data not encrypted with allowed key, skipping…"</string> <string name="msg_dc_askip_not_allowed">"Data not encrypted with allowed key, skipping…"</string>
<string name="msg_dc_asym">"Found block of asymmetrically encrypted data"</string> <string name="msg_dc_asym">"Found block of asymmetrically encrypted data for key %s"</string>
<string name="msg_dc_clear_data">"Processing literal data"</string> <string name="msg_dc_clear_data">"Processing literal data"</string>
<string name="msg_dc_clear_decompress">"Unpacking compressed data"</string> <string name="msg_dc_clear_decompress">"Unpacking compressed data"</string>
<string name="msg_dc_clear_meta_file">"Filesize: %s"</string> <string name="msg_dc_clear_meta_file">"Filename: %s"</string>
<string name="msg_dc_clear_meta_mime">"MIME type: %s"</string> <string name="msg_dc_clear_meta_mime">"MIME type: %s"</string>
<string name="msg_dc_clear_meta_size">"Filesize: %s"</string> <string name="msg_dc_clear_meta_size">"Filesize: %s"</string>
<string name="msg_dc_clear_meta_time">"Modification time: %s"</string> <string name="msg_dc_clear_meta_time">"Modification time: %s"</string>