diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-05-31 02:40:06 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-05-31 02:49:11 +0530 |
| commit | 93f3a98eae1fdd8f9a3a82d415a7284548a2e4bf (patch) | |
| tree | 285121ab1a4eddfd5d465b85bd838f02404baf0a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results | |
| parent | 5d87872245ed781fa610cfa61a35d5e3f85a984e (diff) | |
| download | open-keychain-93f3a98eae1fdd8f9a3a82d415a7284548a2e4bf.tar.gz open-keychain-93f3a98eae1fdd8f9a3a82d415a7284548a2e4bf.tar.bz2 open-keychain-93f3a98eae1fdd8f9a3a82d415a7284548a2e4bf.zip | |
prevent keybase key replacing keyserver key
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results')
| -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 2551c1802..707cf0af1 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 @@ -696,6 +696,7 @@ public abstract class OperationResult implements Parcelable { MSG_IMPORT_FETCH_KEYBASE (LogLevel.INFO, R.string.msg_import_fetch_keybase), MSG_IMPORT_KEYSERVER (LogLevel.DEBUG, R.string.msg_import_keyserver), MSG_IMPORT_MERGE (LogLevel.DEBUG, R.string.msg_import_merge), + MSG_IMPORT_MERGE_ERROR (LogLevel.ERROR, R.string.msg_import_merge_error), MSG_IMPORT_FINGERPRINT_ERROR (LogLevel.ERROR, R.string.msg_import_fingerprint_error), MSG_IMPORT_FINGERPRINT_OK (LogLevel.DEBUG, R.string.msg_import_fingerprint_ok), MSG_IMPORT_ERROR (LogLevel.ERROR, R.string.msg_import_error), |