aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-07 18:26:43 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-07 18:26:43 +0200
commit65a0a0e34f03cf1af9c541c7cb9af2f10f39876c (patch)
treeec2382e9b567f7311b92ef4181c2daa663698b6b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
parentd172058150601c8ae6a3816c936e18685063389f (diff)
downloadopen-keychain-65a0a0e34f03cf1af9c541c7cb9af2f10f39876c.tar.gz
open-keychain-65a0a0e34f03cf1af9c541c7cb9af2f10f39876c.tar.bz2
open-keychain-65a0a0e34f03cf1af9c541c7cb9af2f10f39876c.zip
Make Intent API as recommended in http://developer.android.com/guide/components/intents-filters.html
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
index 61eb9a7b1..7d84a6c5e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
@@ -49,14 +49,14 @@ import java.util.Set;
public class EncryptTextActivity extends DrawerActivity implements EncryptActivityInterface {
/* Intents */
- public static final String ACTION_ENCRYPT = Constants.INTENT_PREFIX + "ENCRYPT";
+ public static final String ACTION_ENCRYPT_TEXT = Constants.INTENT_PREFIX + "ENCRYPT_TEXT";
/* EXTRA keys for input */
- public static final String EXTRA_TEXT = "text";
+ public static final String EXTRA_TEXT = Constants.EXTRA_PREFIX + "EXTRA_TEXT";
// preselect ids, for internal use
- public static final String EXTRA_SIGNATURE_KEY_ID = "signature_key_id";
- public static final String EXTRA_ENCRYPTION_KEY_IDS = "encryption_key_ids";
+ public static final String EXTRA_SIGNATURE_KEY_ID = Constants.EXTRA_PREFIX + "EXTRA_SIGNATURE_KEY_ID";
+ public static final String EXTRA_ENCRYPTION_KEY_IDS = Constants.EXTRA_PREFIX + "EXTRA_SIGNATURE_KEY_IDS";
// view
private int mCurrentMode = MODE_ASYMMETRIC;
@@ -338,7 +338,7 @@ public class EncryptTextActivity extends DrawerActivity implements EncryptActivi
setContentView(R.layout.encrypt_text_activity);
// if called with an intent action, do not init drawer navigation
- if (ACTION_ENCRYPT.equals(getIntent().getAction())) {
+ if (ACTION_ENCRYPT_TEXT.equals(getIntent().getAction())) {
// lock drawer
deactivateDrawerNavigation();
// TODO: back button to key?
@@ -415,9 +415,9 @@ public class EncryptTextActivity extends DrawerActivity implements EncryptActivi
/**
* Main Actions
*/
- if (ACTION_ENCRYPT.equals(action) && textData != null) {
+ if (ACTION_ENCRYPT_TEXT.equals(action) && textData != null) {
mMessage = textData;
- } else if (ACTION_ENCRYPT.equals(action)) {
+ } else if (ACTION_ENCRYPT_TEXT.equals(action)) {
Log.e(Constants.TAG, "Include the extra 'text' in your Intent!");
}
}