diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-27 14:12:59 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-27 14:12:59 +0200 |
| commit | 12a5b2174f79d93e8531fa4e0b3fc0def3796ca9 (patch) | |
| tree | b643a132e6db1f16ebd78845aef0d5032a761ad7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | |
| parent | 86a05033aedc965c1842db45094c744094a906af (diff) | |
| download | open-keychain-12a5b2174f79d93e8531fa4e0b3fc0def3796ca9.tar.gz open-keychain-12a5b2174f79d93e8531fa4e0b3fc0def3796ca9.tar.bz2 open-keychain-12a5b2174f79d93e8531fa4e0b3fc0def3796ca9.zip | |
Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696
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 886f77068..ddc456e34 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -339,6 +339,7 @@ public class OperationResultParcel implements Parcelable { MSG_MG_NEW_SUBKEY (R.string.msg_mg_new_subkey), MSG_MG_FOUND_NEW (R.string.msg_mg_found_new), MSG_MG_UNCHANGED (R.string.msg_mg_unchanged), + MSG_MG_NO_SECRET_KEYRING (R.string.msg_mg_no_secret_keyring), // secret key create MSG_CR (R.string.msg_cr), |