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 17:00:58 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-07 17:00:58 +0200
commitd1e08f9305a451feab0bc7ac93e165952435a599 (patch)
tree0d612f36ee0df776377003441fe7650a8ff9a523 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
parent02663de191e58d3349628fe4e944147ffdc72bc0 (diff)
downloadopen-keychain-d1e08f9305a451feab0bc7ac93e165952435a599.tar.gz
open-keychain-d1e08f9305a451feab0bc7ac93e165952435a599.tar.bz2
open-keychain-d1e08f9305a451feab0bc7ac93e165952435a599.zip
Two buttons to encrypt files and text, some fixes
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.java8
1 files changed, 4 insertions, 4 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 a59c4de68..61eb9a7b1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
@@ -49,7 +49,7 @@ import java.util.Set;
public class EncryptTextActivity extends DrawerActivity implements EncryptActivityInterface {
/* Intents */
- public static final String ACTION_ENCRYPT_TEXT = Constants.INTENT_PREFIX + "ENCRYPT_TEXT";
+ public static final String ACTION_ENCRYPT = Constants.INTENT_PREFIX + "ENCRYPT";
/* EXTRA keys for input */
public static final String EXTRA_TEXT = "text";
@@ -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_TEXT.equals(getIntent().getAction())) {
+ if (ACTION_ENCRYPT.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_TEXT.equals(action) && textData != null) {
+ if (ACTION_ENCRYPT.equals(action) && textData != null) {
mMessage = textData;
- } else if (ACTION_ENCRYPT_TEXT.equals(action)) {
+ } else if (ACTION_ENCRYPT.equals(action)) {
Log.e(Constants.TAG, "Include the extra 'text' in your Intent!");
}
}