diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 17:47:25 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 17:47:25 +0200 |
| commit | 927b12027557e4415b8046372a368801a00299aa (patch) | |
| tree | 7d49f95d11bc011cd48f0d8f0d53f9b491ea61d8 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | |
| parent | 65488cbf05b0c90ac84d9b1895c68455217e3f1b (diff) | |
| parent | 64aac8023ef9c9b08d17346e41d06a667480a118 (diff) | |
| download | open-keychain-927b12027557e4415b8046372a368801a00299aa.tar.gz open-keychain-927b12027557e4415b8046372a368801a00299aa.tar.bz2 open-keychain-927b12027557e4415b8046372a368801a00299aa.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | 1 |
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 99cafd3f9..bfe06dca7 100644 --- 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), |