aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik <dominik@dominikschuermann.de>2012-11-19 18:02:51 +0100
committerDominik <dominik@dominikschuermann.de>2012-11-19 18:02:51 +0100
commiteae7dc54129077c2179e5a2efc9b98e487bc25b9 (patch)
tree6ae11f57e4f4d223614e2fc2a9f54271eb3e4660
parent882610627c4687094e7b00934c27c03f67a7bb3f (diff)
parent4f7d61313cfbe6b0f77bdb7903bf7f682fa6096a (diff)
downloadopen-keychain-eae7dc54129077c2179e5a2efc9b98e487bc25b9.tar.gz
open-keychain-eae7dc54129077c2179e5a2efc9b98e487bc25b9.tar.bz2
open-keychain-eae7dc54129077c2179e5a2efc9b98e487bc25b9.zip
Merge branch 'master' of github.com:dschuermann/apg
-rw-r--r--APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
index 77d1ebd42..f1b4c2bd1 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
+++ b/APG-API-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";