Merge branch 'master' of github.com:open-keychain/open-keychain

2014-07-30 17:47:25 +02:00
parent 65488cbf05 64aac8023e
commit 927b120275
3 changed files with 15 additions and 23 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
@@ -260,6 +260,7 @@ public class OperationResultParcel implements Parcelable {
        // import secret
        MSG_IS(R.string.msg_is),
        MSG_IS_BAD_TYPE_PUBLIC (R.string.msg_is_bad_type_public),
+        MSG_IS_BAD_TYPE_UNCANON (R.string.msg_is_bad_type_uncanon),
        MSG_IS_DB_EXCEPTION (R.string.msg_is_db_exception),
        MSG_IS_FAIL_IO_EXC (R.string.msg_is_io_exc),
        MSG_IS_IMPORTING_SUBKEYS (R.string.msg_is_importing_subkeys),