diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-18 00:33:20 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-18 00:33:20 +0100 |
commit | 9e5aab34830c5b821e3a47d6d3d4f0a637139e2b (patch) | |
tree | 0420a69ab6e583ae67279b4cebd4d8f18e2e1467 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java | |
parent | 39ab2c4bb04d8748312a4da18b006a9de4e711aa (diff) | |
download | open-keychain-9e5aab34830c5b821e3a47d6d3d4f0a637139e2b.tar.gz open-keychain-9e5aab34830c5b821e3a47d6d3d4f0a637139e2b.tar.bz2 open-keychain-9e5aab34830c5b821e3a47d6d3d4f0a637139e2b.zip |
Fix edit key intent, api improvements
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java')
-rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
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; |