diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 00:26:13 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 00:26:13 +0200 |
| commit | 33738b1f520802124821faae12471c4019add17a (patch) | |
| tree | 0b3955cec15186fd687d7eb0ebc5512e0fad257d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations | |
| parent | 74bac3ea36d89f4ee450782fdbb6da49b02ede2e (diff) | |
| download | open-keychain-33738b1f520802124821faae12471c4019add17a.tar.gz open-keychain-33738b1f520802124821faae12471c4019add17a.tar.bz2 open-keychain-33738b1f520802124821faae12471c4019add17a.zip | |
Retry canonicalization with pubkey self certs if first attempt failed
Fixes #974
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java | 1 |
1 files changed, 1 insertions, 0 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 149640bcf..920c83ef7 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 @@ -351,6 +351,7 @@ public abstract class OperationResult implements Parcelable { MSG_IS_ERROR_IO_EXC(LogLevel.DEBUG, R.string.msg_is_error_io_exc), MSG_IS_MERGE_PUBLIC (LogLevel.DEBUG, R.string.msg_is_merge_public), MSG_IS_MERGE_SECRET (LogLevel.DEBUG, R.string.msg_is_merge_secret), + MSG_IS_MERGE_SPECIAL (LogLevel.DEBUG, R.string.msg_is_merge_special), MSG_IS_IMPORTING_SUBKEYS (LogLevel.DEBUG, R.string.msg_is_importing_subkeys), MSG_IS_PUBRING_GENERATE (LogLevel.DEBUG, R.string.msg_is_pubring_generate), MSG_IS_SUBKEY_NONEXISTENT (LogLevel.DEBUG, R.string.msg_is_subkey_nonexistent), |