diff options
3 files changed, 31 insertions, 32 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java index 0bbbdeb31..99bd0ebef 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java @@ -75,7 +75,7 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> { PgpDecryptVerifyInputParcel decryptInput = input.getDecryptInput(); if (decryptInput != null) { - log.add(LogType.MSG_DATA_DECRYPT, 1); + log.add(LogType.MSG_DATA_OPENPGP, 1); PgpDecryptVerifyOperation op = new PgpDecryptVerifyOperation(mContext, mProviderHelper, mProgressable); @@ -175,7 +175,7 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> { out.write(buf, 0, len); } while ((len = is.read(buf)) > 0); - log.add(LogType.MSG_DATA_MIME_LENGTH, 3, totalLength); + log.add(LogType.MSG_DATA_MIME_LENGTH, 3, Long.toString(totalLength)); String charset = bd.getCharset(); // the charset defaults to us-ascii, but we want to default to utf-8 @@ -199,27 +199,26 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> { parser.parse(in); // if no mime data parsed, just return the raw data as fallback - if (outputUris.isEmpty()) { - - log.add(LogType.MSG_DATA_MIME_NONE, 2); - - OpenPgpMetadata metadata; - if (decryptResult != null) { - metadata = decryptResult.getDecryptionMetadata(); - } else { - // if we neither decrypted nor mime-decoded, should this be treated as an error? - // either way, we know nothing about the data - metadata = new OpenPgpMetadata(); - } - - outputUris.add(currentInputUri); - metadatas.add(metadata); + if (!outputUris.isEmpty()) { + log.add(LogType.MSG_DATA_MIME_OK, 2); log.add(LogType.MSG_DATA_OK, 1); return new InputDataResult(InputDataResult.RESULT_OK, log, decryptResult, outputUris, metadatas); } - log.add(LogType.MSG_DATA_MIME_OK, 2); + log.add(LogType.MSG_DATA_MIME_NONE, 2); + + OpenPgpMetadata metadata; + if (decryptResult != null) { + metadata = decryptResult.getDecryptionMetadata(); + } else { + // if we neither decrypted nor mime-decoded, should this be treated as an error? + // either way, we know nothing about the data + metadata = new OpenPgpMetadata(); + } + + outputUris.add(currentInputUri); + metadatas.add(metadata); log.add(LogType.MSG_DATA_OK, 1); return new InputDataResult(InputDataResult.RESULT_OK, log, decryptResult, outputUris, metadatas); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java index 70ff7b338..6db2539d5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java @@ -827,7 +827,7 @@ public abstract class OperationResult implements Parcelable { // InputData Operation MSG_DATA (LogLevel.START, R.string.msg_data), - MSG_DATA_DECRYPT (LogLevel.DEBUG, R.string.msg_data_decrypt), + MSG_DATA_OPENPGP (LogLevel.DEBUG, R.string.msg_data_openpgp), MSG_DATA_ERROR_IO (LogLevel.ERROR, R.string.msg_data_error_io), MSG_DATA_MIME_ERROR (LogLevel.ERROR, R.string.msg_data_mime_error), MSG_DATA_MIME_FILENAME (LogLevel.DEBUG, R.string.msg_data_mime_filename), diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index eafd0b879..c77147395 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1355,19 +1355,19 @@ <string name="msg_lv_fetch_error_format">"Format error!"</string> <string name="msg_lv_fetch_error_nothing">"Resource not found!"</string> - <string name="msg_data">""</string> - <string name="msg_data_decrypt">""</string> - <string name="msg_data_error_io">""</string> - <string name="msg_data_mime_error">""</string> - <string name="msg_data_mime_filename">""</string> - <string name="msg_data_mime_length">""</string> - <string name="msg_data_mime">""</string> - <string name="msg_data_mime_ok">""</string> - <string name="msg_data_mime_none">""</string> - <string name="msg_data_mime_part">""</string> - <string name="msg_data_mime_type">""</string> - <string name="msg_data_ok">""</string> - <string name="msg_data_skip_mime">""</string> + <string name="msg_data">"Processing input data"</string> + <string name="msg_data_openpgp">"Attempting to process OpenPGP data"</string> + <string name="msg_data_error_io">"Error reading input data!"</string> + <string name="msg_data_mime_error">"Error parsing MIME data!"</string> + <string name="msg_data_mime_filename">"Filename: '%s'"</string> + <string name="msg_data_mime_length">"Content-Length: %s"</string> + <string name="msg_data_mime">"Parsing MIME data structure"</string> + <string name="msg_data_mime_ok">"Finished parsing</string> + <string name="msg_data_mime_none">"No MIME structure found"</string> + <string name="msg_data_mime_part">"Processing MIME part"</string> + <string name="msg_data_mime_type">"Content-Type: %s"</string> + <string name="msg_data_ok">"Data processing successful"</string> + <string name="msg_data_skip_mime">"Skipping MIME parsing"</string> <string name="msg_acc_saved">"Account saved"</string> |