return key ids from PassphraseDialogActivity, accept null userids

1 files changed, 3 insertions, 0 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index 29621662f..b06cf0abd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -63,6 +63,7 @@ import org.sufficientlysecure.keychain.util.Preferences;
  */
 public class PassphraseDialogActivity extends FragmentActivity {
     public static final String MESSAGE_DATA_PASSPHRASE = "passphrase";
+    public static final String EXTRA_KEY_ID = "key_id";
 
     public static final String EXTRA_SUBKEY_ID = "secret_key_id";
 
@@ -413,6 +414,8 @@ public class PassphraseDialogActivity extends FragmentActivity {
                 // also return passphrase back to activity
                 Intent returnIntent = new Intent();
                 returnIntent.putExtra(MESSAGE_DATA_PASSPHRASE, passphrase);
+                returnIntent.putExtra(EXTRA_KEY_ID, mSecretRing.getMasterKeyId());
+                returnIntent.putExtra(EXTRA_SUBKEY_ID, mSubKeyId);
                 getActivity().setResult(RESULT_OK, returnIntent);
             }