Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696

2014-08-27 14:12:59 +02:00
parent 86a05033ae
commit 12a5b2174f
3 changed files with 34 additions and 9 deletions
--- 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),