diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 20:55:44 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 20:55:44 +0200 |
commit | 3bffe4da559d0ee45c44df1afee6d5b4de9b89d1 (patch) | |
tree | e749804d053323db8c9ecb91d21f21a7d5f15563 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | f8d895dea4ba1a5133107474410813f4128176ef (diff) | |
download | open-keychain-3bffe4da559d0ee45c44df1afee6d5b4de9b89d1.tar.gz open-keychain-3bffe4da559d0ee45c44df1afee6d5b4de9b89d1.tar.bz2 open-keychain-3bffe4da559d0ee45c44df1afee6d5b4de9b89d1.zip |
generate public keyring from secret if not available
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | 5 |
1 files changed, 3 insertions, 2 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 48eb39a39..cfb977911 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -174,13 +174,14 @@ public class OperationResultParcel implements Parcelable { MSG_IS(R.string.msg_is), MSG_IS_BAD_TYPE_PUBLIC (R.string.msg_is_bad_type_public), MSG_IS_DB_EXCEPTION (R.string.msg_is_db_exception), - MSG_IS_IMPORTING_SUBKEYS (R.string.msg_is_importing_subkeys), MSG_IS_FAIL_IO_EXC (R.string.msg_is_io_exc), + MSG_IS_IMPORTING_SUBKEYS (R.string.msg_is_importing_subkeys), + MSG_IS_PUBRING_GENERATE (R.string.msg_is_pubring_generate), MSG_IS_SUBKEY_NONEXISTENT (R.string.msg_is_subkey_nonexistent), MSG_IS_SUBKEY_OK (R.string.msg_is_subkey_ok), MSG_IS_SUBKEY_STRIPPED (R.string.msg_is_subkey_stripped), - MSG_IS_SUCCESS (R.string.msg_is_success), MSG_IS_SUCCESS_IDENTICAL (R.string.msg_is_success_identical), + MSG_IS_SUCCESS (R.string.msg_is_success), // keyring canonicalization MSG_KC_PUBLIC (R.string.msg_kc_public), |