aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-12 17:38:48 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-12 17:38:48 +0200
commitdae503284f47eb7e5eed71140f9fceaa2ff420c2 (patch)
tree3d39130410774624ba69905a54e91ff06ccb536d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parent466eddb0051d8b19576b60be7e3769f13b308a57 (diff)
downloadopen-keychain-dae503284f47eb7e5eed71140f9fceaa2ff420c2.tar.gz
open-keychain-dae503284f47eb7e5eed71140f9fceaa2ff420c2.tar.bz2
open-keychain-dae503284f47eb7e5eed71140f9fceaa2ff420c2.zip
canonicalize: more stuff
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java17
1 files changed, 10 insertions, 7 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 48f40026e..5c223e870 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
@@ -158,18 +158,21 @@ public class OperationResultParcel implements Parcelable {
// keyring canonicalization
MSG_KC (R.string.msg_kc),
- MSG_KC_CERT_BAD_ERR (R.string.msg_kc_cert_bad_err),
- MSG_KC_CERT_BAD_KEYID (R.string.msg_kc_cert_bad_keyid),
- MSG_KC_CERT_BAD (R.string.msg_kc_cert_bad),
- MSG_KC_CERT_BAD_TYPE (R.string.msg_kc_cert_bad_type),
MSG_KC_MASTER (R.string.msg_kc_master),
MSG_KC_MASTER_SUCCESS (R.string.msg_kc_master_success),
MSG_KC_REVOKE_BAD_ERR (R.string.msg_kc_revoke_bad_err),
MSG_KC_REVOKE_BAD (R.string.msg_kc_revoke_bad),
MSG_KC_REVOKE_DUP (R.string.msg_kc_revoke_dup),
- MSG_KC_SUBKEY_NO_CERT (R.string.msg_kc_subkey_no_cert),
- MSG_KC_SUBKEY (R.string.msg_kc_subkey),
- MSG_KC_SUBKEY_SUCCESS (R.string.msg_kc_subkey_success),
+ MSG_KC_SUB (R.string.msg_kc_sub),
+ MSG_KC_SUB_BAD_ERR(R.string.msg_kc_sub_bad_err),
+ MSG_KC_SUB_BAD_KEYID(R.string.msg_kc_sub_bad_keyid),
+ MSG_KC_SUB_BAD(R.string.msg_kc_sub_bad),
+ MSG_KC_SUB_BAD_TYPE(R.string.msg_kc_sub_bad_type),
+ MSG_KC_SUB_NO_CERT(R.string.msg_kc_sub_no_cert),
+ MSG_KC_SUB_REVOKE_BAD_ERR (R.string.msg_kc_sub_revoke_bad_err),
+ MSG_KC_SUB_REVOKE_BAD (R.string.msg_kc_sub_revoke_bad),
+ MSG_KC_SUB_REVOKE_DUP (R.string.msg_kc_sub_revoke_dup),
+ MSG_KC_SUB_SUCCESS (R.string.msg_kc_sub_success),
MSG_KC_SUCCESS_REMOVED (R.string.msg_kc_success_removed),
MSG_KC_SUCCESS (R.string.msg_kc_success),
MSG_KC_UID_BAD_ERR (R.string.msg_kc_uid_bad_err),