Merge with ashh87s pull request

1 files changed, 3 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..1e7fe0120 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
@@ -121,6 +121,7 @@ public class SignKeyActivity extends SherlockFragmentActivity {
             // kick off the SecretKey selection activity so the user chooses which key to sign with
             // first
             Intent intent = new Intent(this, SelectSecretKeyActivity.class);
+            intent.putExtra(SelectSecretKeyActivity.EXTRA_FILTER_CERTIFY, true);
             startActivityForResult(intent, Id.request.secret_keys);
         }
     }
@@ -295,7 +296,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);