aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-07-08 02:28:05 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-07-08 02:28:05 +0200
commit510999c3a2de2475f7828e283d4f01e46a4fe9f7 (patch)
tree8f049f9ffa4aa5c4c4fda275a2c5b0c9ca83d343 /OpenKeychain/src/main
parentd9b07625e8b492d2d3b0ee5b0c898c3315b31439 (diff)
downloadopen-keychain-510999c3a2de2475f7828e283d4f01e46a4fe9f7.tar.gz
open-keychain-510999c3a2de2475f7828e283d4f01e46a4fe9f7.tar.bz2
open-keychain-510999c3a2de2475f7828e283d4f01e46a4fe9f7.zip
fix result type for divert-to-card new subkey error
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 440d57d36..5eaa03394 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -978,7 +978,7 @@ public class PgpKeyOperation {
if (isDivertToCard(masterSecretKey)) {
log.add(LogType.MSG_MF_ERROR_DIVERT_NEWSUB, indent +1);
- return new PgpEditKeyResult(PgpEditKeyResult.RESULT_CANCELLED, log, null);
+ return new PgpEditKeyResult(PgpEditKeyResult.RESULT_ERROR, log, null);
}
if (add.mExpiry == null) {