aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-17 21:51:11 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-17 21:51:11 +0200
commit955a1f4b2664dd548a71a343a4792bf1a4c8cfa9 (patch)
tree20db94c8e7bd50e4917639c9a5685184c2a08d59 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
parentfdb1a7384e81d6b395ec6d930a1df46eb7db9496 (diff)
downloadopen-keychain-955a1f4b2664dd548a71a343a4792bf1a4c8cfa9.tar.gz
open-keychain-955a1f4b2664dd548a71a343a4792bf1a4c8cfa9.tar.bz2
open-keychain-955a1f4b2664dd548a71a343a4792bf1a4c8cfa9.zip
mime: support for signed-then-encrypted format
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java8
1 files changed, 7 insertions, 1 deletions
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 590a93872..3fb5be0ad 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
@@ -830,6 +830,12 @@ public abstract class OperationResult implements Parcelable {
MSG_DATA_OPENPGP (LogLevel.DEBUG, R.string.msg_data_openpgp),
MSG_DATA_ERROR_IO (LogLevel.ERROR, R.string.msg_data_error_io),
MSG_DATA_ERROR_OPENPGP (LogLevel.ERROR, R.string.msg_data_error_openpgp),
+ MSG_DATA_DETACHED (LogLevel.INFO, R.string.msg_data_detached),
+ MSG_DATA_DETACHED_CLEAR (LogLevel.WARN, R.string.msg_data_detached_clear),
+ MSG_DATA_DETACHED_SIG (LogLevel.DEBUG, R.string.msg_data_detached_sig),
+ MSG_DATA_DETACHED_RAW (LogLevel.DEBUG, R.string.msg_data_detached_raw),
+ MSG_DATA_DETACHED_NESTED(LogLevel.WARN, R.string.msg_data_detached_nested),
+ MSG_DATA_DETACHED_UNSUPPORTED (LogLevel.WARN, R.string.msg_data_detached_unsupported),
MSG_DATA_MIME_ERROR (LogLevel.ERROR, R.string.msg_data_mime_error),
MSG_DATA_MIME_FILENAME (LogLevel.DEBUG, R.string.msg_data_mime_filename),
MSG_DATA_MIME_LENGTH (LogLevel.DEBUG, R.string.msg_data_mime_length),
@@ -1004,7 +1010,7 @@ public abstract class OperationResult implements Parcelable {
for (LogEntryParcel entry : this) {
log.append(entry.getPrintableLogEntry(resources, indent)).append("\n");
}
- return log.toString().substring(0, log.length() -1); // get rid of extra new line
+ return log.toString().substring(0, log.length() - 1); // get rid of extra new line
}
}