diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2012-11-19 08:07:52 -0800 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2012-11-19 08:07:52 -0800 |
commit | 4f7d61313cfbe6b0f77bdb7903bf7f682fa6096a (patch) | |
tree | 688529ea9813cb12bf7f32bd3896ea4f61504a0d | |
parent | e8ec4d280c75dc1aa5eb58dfaf49b35c9b6c8776 (diff) | |
parent | 10a565383d2aff2070fa92159d0a9ebb65eeb7f6 (diff) | |
download | open-keychain-4f7d61313cfbe6b0f77bdb7903bf7f682fa6096a.tar.gz open-keychain-4f7d61313cfbe6b0f77bdb7903bf7f682fa6096a.tar.bz2 open-keychain-4f7d61313cfbe6b0f77bdb7903bf7f682fa6096a.zip |
Merge pull request #26 from mtparet/master
EXTRA_KEY_ID = "masterKeyId"
-rw-r--r-- | org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java index 77d1ebd42..f1b4c2bd1 100644 --- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java +++ b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java @@ -50,7 +50,7 @@ public class ApgIntentHelper { public static final String EXTRA_SIGNATURE_UNKNOWN = "signatureUnknown"; public static final String EXTRA_USER_ID = "userId"; public static final String EXTRA_USER_IDS = "userIds"; - public static final String EXTRA_KEY_ID = "keyId"; + public static final String EXTRA_KEY_ID = "masterKeyId"; public static final String EXTRA_ENCRYPTION_KEY_IDS = "encryptionKeyIds"; public static final String EXTRA_SELECTION = "selection"; public static final String EXTRA_MESSAGE = "message"; |