aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src
diff options
context:
space:
mode:
authorAsh Hughes <ashes-iontach@hotmail.com>2013-03-16 00:15:06 +0000
committerAsh Hughes <ashes-iontach@hotmail.com>2013-03-16 00:15:06 +0000
commit2ccd3796c4c6bae5fb587f031dcf848a2ad72ff0 (patch)
tree385f13f5fed354e1870348793db0e8a6d248bef1 /OpenPGP-Keychain/src
parent4fc4f09e84718efdfda41cbd7d8822a393e65a60 (diff)
downloadopen-keychain-2ccd3796c4c6bae5fb587f031dcf848a2ad72ff0.tar.gz
open-keychain-2ccd3796c4c6bae5fb587f031dcf848a2ad72ff0.tar.bz2
open-keychain-2ccd3796c4c6bae5fb587f031dcf848a2ad72ff0.zip
select correct master key for signing public key with
Diffstat (limited to 'OpenPGP-Keychain/src')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
index 21d55aca0..6ded66468 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
@@ -295,7 +295,8 @@ public class SignKeyActivity extends SherlockFragmentActivity {
switch (requestCode) {
case Id.request.secret_keys: {
if (resultCode == RESULT_OK) {
- mMasterKeyId = data.getLongExtra(EXTRA_KEY_ID, 0);
+ Bundle bundle = data.getExtras();
+ mMasterKeyId = bundle.getLong(SelectSecretKeyActivity.RESULT_EXTRA_MASTER_KEY_ID);
// re-enable the sign button so the user can initiate the sign process
Button sign = (Button) findViewById(R.id.sign);