aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-08-20 19:59:45 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-08-20 19:59:45 +0200
commit475293a116b5c3f7937bc5075921a2a0cb9c9a29 (patch)
treed1cb792bf5fe5ff651a4ec20df570b603f61a009 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parent2a96912a96f6b740c40331fb83f715d4d1abf597 (diff)
downloadopen-keychain-475293a116b5c3f7937bc5075921a2a0cb9c9a29.tar.gz
open-keychain-475293a116b5c3f7937bc5075921a2a0cb9c9a29.tar.bz2
open-keychain-475293a116b5c3f7937bc5075921a2a0cb9c9a29.zip
consolidate: prevent concurrent calls of step 2
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
index 91939739a..7fe712534 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
@@ -396,6 +396,7 @@ public class OperationResultParcel implements Parcelable {
MSG_CON_DELETE_PUBLIC (R.string.msg_con_delete_public),
MSG_CON_DELETE_SECRET (R.string.msg_con_delete_secret),
MSG_CON_ERROR_BAD_STATE (R.string.msg_con_error_bad_state),
+ MSG_CON_ERROR_CONCURRENT(R.string.msg_con_error_concurrent),
MSG_CON_ERROR_DB (R.string.msg_con_error_db),
MSG_CON_ERROR_IO_PUBLIC (R.string.msg_con_error_io_public),
MSG_CON_ERROR_IO_SECRET (R.string.msg_con_error_io_secret),