Merge branch 'master' of github.com:dschuermann/apg

This commit is contained in:
Dominik 2012-11-19 18:02:51 +01:00
commit eae7dc5412

View File

@ -50,7 +50,7 @@ public class ApgIntentHelper {
public static final String EXTRA_SIGNATURE_UNKNOWN = "signatureUnknown"; public static final String EXTRA_SIGNATURE_UNKNOWN = "signatureUnknown";
public static final String EXTRA_USER_ID = "userId"; public static final String EXTRA_USER_ID = "userId";
public static final String EXTRA_USER_IDS = "userIds"; 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_ENCRYPTION_KEY_IDS = "encryptionKeyIds";
public static final String EXTRA_SELECTION = "selection"; public static final String EXTRA_SELECTION = "selection";
public static final String EXTRA_MESSAGE = "message"; public static final String EXTRA_MESSAGE = "message";