From 9e5aab34830c5b821e3a47d6d3d4f0a637139e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 18 Jan 2013 00:33:20 +0100 Subject: Fix edit key intent, api improvements --- .../src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java') diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java index 8c5bd6879..42f559b1d 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java @@ -74,7 +74,7 @@ public class EditKeyActivity extends SherlockFragmentActivity { public static final String EXTRA_USER_IDS = "userIds"; public static final String EXTRA_NO_PASSPHRASE = "noPassphrase"; public static final String EXTRA_GENERATE_DEFAULT_KEYS = "generateDefaultKeys"; - public static final String EXTRA_KEY_ID = "keyId"; + public static final String EXTRA_MASTER_KEY_ID = "masterKeyId"; // results when saving key public static final String RESULT_EXTRA_MASTER_KEY_ID = "masterKeyId"; @@ -317,8 +317,8 @@ public class EditKeyActivity extends SherlockFragmentActivity { } if (extras != null) { - if (extras.containsKey(EXTRA_KEY_ID)) { - long keyId = extras.getLong(EXTRA_KEY_ID); + if (extras.containsKey(EXTRA_MASTER_KEY_ID)) { + long keyId = extras.getLong(EXTRA_MASTER_KEY_ID); if (keyId != 0) { PGPSecretKey masterKey = null; -- cgit v1.2.3