From f334dea1b52c40a6737caabdb65b562b6038e6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 17 Jan 2013 01:53:49 +0100 Subject: rename intent actions to use KEYRING instead of KEY --- .../src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java | 4 ++-- .../org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java | 2 +- .../org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain') diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java index 73a1234c4..8c5bd6879 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java @@ -67,8 +67,8 @@ import java.util.Vector; public class EditKeyActivity extends SherlockFragmentActivity { // possible intent actions for this activity - public static final String ACTION_CREATE_KEY = Constants.INTENT_PREFIX + "CREATE_KEY"; - public static final String ACTION_EDIT_KEY = Constants.INTENT_PREFIX + "EDIT_KEY"; + public static final String ACTION_CREATE_KEY = Constants.INTENT_PREFIX + "CREATE_KEYRING"; + public static final String ACTION_EDIT_KEY = Constants.INTENT_PREFIX + "EDIT_KEYRING"; // possible extra keys public static final String EXTRA_USER_IDS = "userIds"; diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java index fc1cfba17..d209662f7 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java @@ -33,7 +33,7 @@ public class SelectPublicKeyActivity extends SherlockFragmentActivity { // Not used in sourcode, but listed in AndroidManifest! public static final String ACTION_SELECT_PUBLIC_KEYS = Constants.INTENT_PREFIX - + "SELECT_PUBLIC_KEYS"; + + "SELECT_PUBLIC_KEYRINGS"; public static final String EXTRA_SELECTED_MASTER_KEY_IDS = "masterKeyIds"; diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java index 6f43cbabc..14ccb17c7 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java @@ -32,7 +32,7 @@ public class SelectSecretKeyActivity extends SherlockFragmentActivity { // Not used in sourcode, but listed in AndroidManifest! public static final String ACTION_SELECT_SECRET_KEY = Constants.INTENT_PREFIX - + "SELECT_SECRET_KEY"; + + "SELECT_SECRET_KEYRING"; public static final String RESULT_EXTRA_MASTER_KEY_ID = "masterKeyId"; public static final String RESULT_EXTRA_USER_ID = "userId"; -- cgit v1.2.3